From: Masaki Kanno Subject: [PATCH] Fix xm pci-attach/detach for inactive managed domains Date: Thu, 09 Apr 2009 19:20:18 +0900 Message-ID: <13C9B8FCC82EFFkanno.masaki@jp.fujitsu.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-TxVrAKyFNmm6GpIv34BQ4" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org --Boundary-TxVrAKyFNmm6GpIv34BQ4 Content-Type: text/plain; charset=iso-2022-jp Content-Transfer-Encoding: 7bit Content-Description: Mail message body Hi, I found the following problems. xm pci-attach command and xm pci-detach command fail on inactive managed domains. An attaching patch solves the problems. # xm list Name ID Mem VCPUs State Time(s) Domain-0 0 1024 2 r----- 51.5 vm1 512 2 0.0 # xm pci-list vm1 VSlt domain bus slot func 0x3 0x0 0x01 0x00 0x0 0x4 0x0 0x01 0x00 0x1 0x10 0x0 0x00 0x1a 0x0 # xm pci-attach vm1 0:0:1a.1 11 Error: int argument required Usage: xm pci-attach [-o|--options=] [virtual slot] Insert a new pass-through pci device. # xm pci-detach vm1 0:0:1a.0 Error: int argument required Usage: xm pci-detach Remove a domain's pass-through pci device. Signed-off-by: Masaki Kanno Best regards, Kan --Boundary-TxVrAKyFNmm6GpIv34BQ4 Content-Type: application/octet-stream; name="pci_inactive_managed_domains.patch" Content-Disposition: attachment; filename="pci_inactive_managed_domains.patch" Content-Transfer-Encoding: base64 ZGlmZiAtciBkNjFkMTM1MjkxZjcgdG9vbHMvcHl0aG9uL3hlbi94ZW5kL1hlbmREb21haW5J bmZvLnB5Ci0tLSBhL3Rvb2xzL3B5dGhvbi94ZW4veGVuZC9YZW5kRG9tYWluSW5mby5weQlX ZWQgQXByIDA4IDEwOjE4OjMxIDIwMDkgKzAxMDAKKysrIGIvdG9vbHMvcHl0aG9uL3hlbi94 ZW5kL1hlbmREb21haW5JbmZvLnB5CVRodSBBcHIgMDkgMTg6NDM6MDEgMjAwOSArMDkwMApA QCAtNjg1LDMxICs2ODUsMzkgQEAgY2xhc3MgWGVuZERvbWFpbkluZm86CiAgICAgICAgICMg Y28tYXNzaWdubWVudCBkZXZpY2VzIGhhc24ndCBiZWVuIGFzc2lnbmVkLCBvciBoYXMgYmVl biBhc3NpZ25lZCB0bwogICAgICAgICAjIGRvbU4uCiAgICAgICAgIGNvYXNzaWdubWVudF9s aXN0ID0gcGNpX2RldmljZS5maW5kX2NvYXNzaWduZWRfZGV2aWNlcygpCi0gICAgICAgIGFz c2lnbmVkX3BjaV9kZXZpY2Vfc3RyX2xpc3QgPSBnZXRfYXNzaWduZWRfcGNpX2RldmljZXMo c2VsZi5kb21pZCkKKyAgICAgICAgYXNzaWduZWRfcGNpX2RldmljZV9zdHJfbGlzdCA9IHNl bGYuX2dldF9hc3NpZ25lZF9wY2lfZGV2aWNlcygpCiAgICAgICAgIGZvciBwY2lfc3RyIGlu IGNvYXNzaWdubWVudF9saXN0OgogICAgICAgICAgICAgKGRvbWFpbiwgYnVzLCBkZXYsIGZ1 bmMpID0gcGFyc2VfcGNpX25hbWUocGNpX3N0cikgCiAgICAgICAgICAgICBkZXZfc3RyID0g ICcweCV4LDB4JXgsMHgleCwweCV4JyAlIChkb21haW4sIGJ1cywgZGV2LCBmdW5jKQogICAg ICAgICAgICAgaWYgeGMudGVzdF9hc3NpZ25fZGV2aWNlKDAsIGRldl9zdHIpID09IDA6CiAg ICAgICAgICAgICAgICAgY29udGludWUKICAgICAgICAgICAgIGlmIG5vdCBwY2lfc3RyIGlu IGFzc2lnbmVkX3BjaV9kZXZpY2Vfc3RyX2xpc3Q6Ci0gICAgICAgICAgICAgICAgcmFpc2Ug Vm1FcnJvcigoJ3BjaTogZmFpbGVkIHRvIHBjaS1hdHRhY2ggJXMgdG8gZG9tJWQiICsgXAor ICAgICAgICAgICAgICAgIHJhaXNlIFZtRXJyb3IoKCJwY2k6IGZhaWxlZCB0byBwY2ktYXR0 YWNoICVzIHRvIGRvbWFpbiAlcyIgKyBcCiAgICAgICAgICAgICAgICAgICAgICIgYmVjYXVz ZSBvbmUgb2YgaXRzIGNvLWFzc2lnbm1lbnQgZGV2aWNlICVzIGhhcyBiZWVuIiArIFwKLSAg ICAgICAgICAgICAgICAgICAgIiBhc3NpZ25lZCB0byBvdGhlciBkb21haW4uJyBcCi0gICAg ICAgICAgICAgICAgICAgICklIChwY2lfZGV2aWNlLm5hbWUsIHNlbGYuZG9taWQsIHBjaV9z dHIpKQotCi0gICAgICAgIG9wdHMgPSAnJwotICAgICAgICBpZiAnb3B0cycgaW4gbmV3X2Rl diBhbmQgbGVuKG5ld19kZXZbJ29wdHMnXSkgPiAwOgotICAgICAgICAgICAgY29uZmlnX29w dHMgPSBuZXdfZGV2WydvcHRzJ10KLSAgICAgICAgICAgIGNvbmZpZ19vcHRzID0gbWFwKGxh bWJkYSAoeCwgeSk6IHgrJz0nK3ksIGNvbmZpZ19vcHRzKQotICAgICAgICAgICAgb3B0cyA9 ICcsJyArIHJlZHVjZShsYW1iZGEgeCwgeTogeCsnLCcreSwgY29uZmlnX29wdHMpCi0KLSAg ICAgICAgYmRmX3N0ciA9ICIlczolczolcy4lcyVzQCVzIiAlIChuZXdfZGV2Wydkb21haW4n XSwKKyAgICAgICAgICAgICAgICAgICAgIiBhc3NpZ25lZCB0byBvdGhlciBkb21haW4uIiBc CisgICAgICAgICAgICAgICAgICAgICklIChwY2lfZGV2aWNlLm5hbWUsIHNlbGYuaW5mb1sn bmFtZV9sYWJlbCddLCBwY2lfc3RyKSkKKworICAgICAgICBpZiBzZWxmLmRvbWlkIGlzIG5v dCBOb25lOgorICAgICAgICAgICAgb3B0cyA9ICcnCisgICAgICAgICAgICBpZiAnb3B0cycg aW4gbmV3X2RldiBhbmQgbGVuKG5ld19kZXZbJ29wdHMnXSkgPiAwOgorICAgICAgICAgICAg ICAgIGNvbmZpZ19vcHRzID0gbmV3X2Rldlsnb3B0cyddCisgICAgICAgICAgICAgICAgY29u ZmlnX29wdHMgPSBtYXAobGFtYmRhICh4LCB5KTogeCsnPScreSwgY29uZmlnX29wdHMpCisg ICAgICAgICAgICAgICAgb3B0cyA9ICcsJyArIHJlZHVjZShsYW1iZGEgeCwgeTogeCsnLCcr eSwgY29uZmlnX29wdHMpCisKKyAgICAgICAgICAgIGJkZl9zdHIgPSAiJXM6JXM6JXMuJXMl c0AlcyIgJSAobmV3X2RldlsnZG9tYWluJ10sCiAgICAgICAgICAgICAgICAgbmV3X2Rldlsn YnVzJ10sCiAgICAgICAgICAgICAgICAgbmV3X2Rldlsnc2xvdCddLAogICAgICAgICAgICAg ICAgIG5ld19kZXZbJ2Z1bmMnXSwKICAgICAgICAgICAgICAgICBvcHRzLAogICAgICAgICAg ICAgICAgIG5ld19kZXZbJ3ZzbG90J10pCi0gICAgICAgIHNlbGYuaW1hZ2Uuc2lnbmFsRGV2 aWNlTW9kZWwoJ3BjaS1pbnMnLCAncGNpLWluc2VydGVkJywgYmRmX3N0cikKKyAgICAgICAg ICAgIHNlbGYuaW1hZ2Uuc2lnbmFsRGV2aWNlTW9kZWwoJ3BjaS1pbnMnLCAncGNpLWluc2Vy dGVkJywgYmRmX3N0cikKKworICAgICAgICAgICAgdnNsb3QgPSB4c3RyYW5zYWN0LlJlYWQo Ii9sb2NhbC9kb21haW4vMC9kZXZpY2UtbW9kZWwvJWkvcGFyYW1ldGVyIgorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgJSBzZWxmLmdldERvbWlkKCkpCisgICAgICAg IGVsc2U6CisgICAgICAgICAgICB2c2xvdCA9IG5ld19kZXZbJ3ZzbG90J10KKworICAgICAg ICByZXR1cm4gdnNsb3QKIAogCiAgICAgZGVmIGRldmljZV9jcmVhdGUoc2VsZiwgZGV2X2Nv bmZpZyk6CkBAIC03ODgsMTAgKzc5Niw4IEBAIGNsYXNzIFhlbmREb21haW5JbmZvOgogICAg ICAgICBpZiBzZWxmLmluZm8uaXNfaHZtKCk6CiAgICAgICAgICAgICBpZiBwY2lfc3RhdGUg PT0gJ0luaXRpYWxpc2luZyc6CiAgICAgICAgICAgICAgICAgIyBIVk0gUENJIGRldmljZSBh dHRhY2htZW50Ci0gICAgICAgICAgICAgICAgc2VsZi5odm1fcGNpX2RldmljZV9jcmVhdGUo ZGV2X2NvbmZpZykKKyAgICAgICAgICAgICAgICB2c2xvdCA9IHNlbGYuaHZtX3BjaV9kZXZp Y2VfY3JlYXRlKGRldl9jb25maWcpCiAgICAgICAgICAgICAgICAgIyBVcGRhdGUgdnNsb3QK LSAgICAgICAgICAgICAgICB2c2xvdCA9IHhzdHJhbnNhY3QuUmVhZCgiL2xvY2FsL2RvbWFp bi8wL2RldmljZS1tb2RlbC8laS9wYXJhbWV0ZXIiCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgJSBzZWxmLmdldERvbWlkKCkpCiAgICAgICAgICAgICAgICAg ZGV2Wyd2c2xvdCddID0gdnNsb3QKICAgICAgICAgICAgICAgICBmb3IgbiBpbiBzeHAuY2hp bGRyZW4ocGNpX2Rldik6CiAgICAgICAgICAgICAgICAgICAgIGlmKG5bMF0gPT0gJ3ZzbG90 Jyk6CkBAIC04MjUsMzUgKzgzMSw2NiBAQCBjbGFzcyBYZW5kRG9tYWluSW5mbzoKICAgICAg ICAgICAgIHNlbGYuZGV2aWNlX2NyZWF0ZShkZXZfc3hwKQogICAgICAgICAgICAgcmV0dXJu IFRydWUKIAotICAgICAgICAjIHVzZSBEZXZDb250cm9sbGVyLnJlY29uZmlndXJlRGV2aWNl IHRvIGNoYW5nZSBkZXZpY2UgY29uZmlnCi0gICAgICAgIGRldl9jb250cm9sID0gc2VsZi5n ZXREZXZpY2VDb250cm9sbGVyKGRldl9jbGFzcykKLSAgICAgICAgZGV2X3V1aWQgPSBkZXZf Y29udHJvbC5yZWNvbmZpZ3VyZURldmljZShkZXZpZCwgZGV2X2NvbmZpZykKLSAgICAgICAg aWYgbm90IHNlbGYuaW5mby5pc19odm0oKToKLSAgICAgICAgICAgICMgaW4gUFYgY2FzZSwg d2FpdCB1bnRpbCBiYWNrZW5kIHN0YXRlIGJlY29tZXMgY29ubmVjdGVkLgotICAgICAgICAg ICAgZGV2X2NvbnRyb2wud2FpdEZvckRldmljZV9yZWNvbmZpZ3VyZShkZXZpZCkKLSAgICAg ICAgbnVtX2RldnMgPSBkZXZfY29udHJvbC5jbGVhbnVwRGV2aWNlKGRldmlkKQotCi0gICAg ICAgICMgdXBkYXRlIFhlbmRDb25maWcgd2l0aCBuZXcgZGV2aWNlIGluZm8KLSAgICAgICAg aWYgZGV2X3V1aWQ6Ci0gICAgICAgICAgICBuZXdfZGV2X3N4cCA9IGRldl9jb250cm9sLmNv bmZpZ3VyYXRpb24oZGV2aWQpCisgICAgICAgIGlmIHNlbGYuZG9taWQgaXMgbm90IE5vbmU6 CisgICAgICAgICAgICAjIHVzZSBEZXZDb250cm9sbGVyLnJlY29uZmlndXJlRGV2aWNlIHRv IGNoYW5nZSBkZXZpY2UgY29uZmlnCisgICAgICAgICAgICBkZXZfY29udHJvbCA9IHNlbGYu Z2V0RGV2aWNlQ29udHJvbGxlcihkZXZfY2xhc3MpCisgICAgICAgICAgICBkZXZfdXVpZCA9 IGRldl9jb250cm9sLnJlY29uZmlndXJlRGV2aWNlKGRldmlkLCBkZXZfY29uZmlnKQorICAg ICAgICAgICAgaWYgbm90IHNlbGYuaW5mby5pc19odm0oKToKKyAgICAgICAgICAgICAgICAj IGluIFBWIGNhc2UsIHdhaXQgdW50aWwgYmFja2VuZCBzdGF0ZSBiZWNvbWVzIGNvbm5lY3Rl ZC4KKyAgICAgICAgICAgICAgICBkZXZfY29udHJvbC53YWl0Rm9yRGV2aWNlX3JlY29uZmln dXJlKGRldmlkKQorICAgICAgICAgICAgbnVtX2RldnMgPSBkZXZfY29udHJvbC5jbGVhbnVw RGV2aWNlKGRldmlkKQorCisgICAgICAgICAgICAjIHVwZGF0ZSBYZW5kQ29uZmlnIHdpdGgg bmV3IGRldmljZSBpbmZvCisgICAgICAgICAgICBpZiBkZXZfdXVpZDoKKyAgICAgICAgICAg ICAgICBuZXdfZGV2X3N4cCA9IGRldl9jb250cm9sLmNvbmZpZ3VyYXRpb24oZGV2aWQpCisg ICAgICAgICAgICAgICAgc2VsZi5pbmZvLmRldmljZV91cGRhdGUoZGV2X3V1aWQsIG5ld19k ZXZfc3hwKQorCisgICAgICAgICAgICAjIElmIHRoZXJlIGlzIG5vIGRldmljZSBsZWZ0LCBk ZXN0cm95IHBjaSBhbmQgcmVtb3ZlIGNvbmZpZy4KKyAgICAgICAgICAgIGlmIG51bV9kZXZz ID09IDA6CisgICAgICAgICAgICAgICAgaWYgc2VsZi5pbmZvLmlzX2h2bSgpOgorICAgICAg ICAgICAgICAgICAgICBzZWxmLmRlc3Ryb3lEZXZpY2UoJ3BjaScsIGRldmlkLCBUcnVlKQor ICAgICAgICAgICAgICAgICAgICBkZWwgc2VsZi5pbmZvWydkZXZpY2VzJ11bZGV2X3V1aWRd CisgICAgICAgICAgICAgICAgICAgIHBsYXRmb3JtID0gc2VsZi5pbmZvWydwbGF0Zm9ybSdd CisgICAgICAgICAgICAgICAgICAgIG9yaWdfZGV2X251bSA9IGxlbihwbGF0Zm9ybVsncGNp J10pCisgICAgICAgICAgICAgICAgICAgICMgVE9ETzogY2FuIHVzZSB0aGlzIHRvIGtlZXAg c29tZSBpbmZvIHRvIGFzayBoaWdoIGxldmVsCisgICAgICAgICAgICAgICAgICAgICMgbWFu YWdlbWVudCB0b29scyB0byBob3QgaW5zZXJ0IGEgbmV3IHBhc3N0aHJvdWdoIGRldgorICAg ICAgICAgICAgICAgICAgICAjIGFmdGVyIG1pZ3JhdGlvbgorICAgICAgICAgICAgICAgICAg ICBpZiBvcmlnX2Rldl9udW0gIT0gMDoKKyAgICAgICAgICAgICAgICAgICAgICAgICNwbGF0 Zm9ybVsncGNpJ10gPSBbIiVkREVWcyIgJSBvcmlnX2Rldl9udW1dCisgICAgICAgICAgICAg ICAgICAgICAgICBwbGF0Zm9ybVsncGNpJ10gPSBbXQorICAgICAgICAgICAgICAgIGVsc2U6 CisgICAgICAgICAgICAgICAgICAgIHNlbGYuZGVzdHJveURldmljZSgncGNpJywgZGV2aWQp CisgICAgICAgICAgICAgICAgICAgIGRlbCBzZWxmLmluZm9bJ2RldmljZXMnXVtkZXZfdXVp ZF0KKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIG5ld19kZXZfc3hwID0gWydwY2knXQor ICAgICAgICAgICAgZm9yIGN1cl9kZXYgaW4gc3hwLmNoaWxkcmVuKGV4aXN0aW5nX2Rldl9p bmZvLCAnZGV2Jyk6CisgICAgICAgICAgICAgICAgaWYgcGNpX3N0YXRlID09ICdDbG9zaW5n JzoKKyAgICAgICAgICAgICAgICAgICAgaWYgaW50KGRldlsnZG9tYWluJ10sIDE2KSA9PSBp bnQoc3hwLmNoaWxkX3ZhbHVlKGN1cl9kZXYsICdkb21haW4nKSwgMTYpIGFuZCBcCisgICAg ICAgICAgICAgICAgICAgICAgIGludChkZXZbJ2J1cyddLCAxNikgPT0gaW50KHN4cC5jaGls ZF92YWx1ZShjdXJfZGV2LCAnYnVzJyksIDE2KSBhbmQgXAorICAgICAgICAgICAgICAgICAg ICAgICBpbnQoZGV2WydzbG90J10sIDE2KSA9PSBpbnQoc3hwLmNoaWxkX3ZhbHVlKGN1cl9k ZXYsICdzbG90JyksIDE2KSBhbmQgXAorICAgICAgICAgICAgICAgICAgICAgICBpbnQoZGV2 WydmdW5jJ10sIDE2KSA9PSBpbnQoc3hwLmNoaWxkX3ZhbHVlKGN1cl9kZXYsICdmdW5jJyks IDE2KToKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCisgICAgICAgICAgICAg ICAgbmV3X2Rldl9zeHAuYXBwZW5kKGN1cl9kZXYpCisKKyAgICAgICAgICAgIGlmIHBjaV9z dGF0ZSA9PSAnSW5pdGlhbGlzaW5nJzoKKyAgICAgICAgICAgICAgICBmb3IgbmV3X2RldiBp biBzeHAuY2hpbGRyZW4oZGV2X3N4cCwgJ2RldicpOgorICAgICAgICAgICAgICAgICAgICBu ZXdfZGV2X3N4cC5hcHBlbmQobmV3X2RldikKKworICAgICAgICAgICAgZGV2X3V1aWQgPSBz eHAuY2hpbGRfdmFsdWUoZXhpc3RpbmdfZGV2X2luZm8sICd1dWlkJykKICAgICAgICAgICAg IHNlbGYuaW5mby5kZXZpY2VfdXBkYXRlKGRldl91dWlkLCBuZXdfZGV2X3N4cCkKIAotICAg ICAgICAjIElmIHRoZXJlIGlzIG5vIGRldmljZSBsZWZ0LCBkZXN0cm95IHBjaSBhbmQgcmVt b3ZlIGNvbmZpZy4KLSAgICAgICAgaWYgbnVtX2RldnMgPT0gMDoKLSAgICAgICAgICAgIGlm IHNlbGYuaW5mby5pc19odm0oKToKLSAgICAgICAgICAgICAgICBzZWxmLmRlc3Ryb3lEZXZp Y2UoJ3BjaScsIGRldmlkLCBUcnVlKQorICAgICAgICAgICAgIyBJZiB0aGVyZSBpcyBvbmx5 ICd2c2NzaScgaW4gbmV3X2Rldl9zeHAsIHJlbW92ZSB0aGUgY29uZmlnLgorICAgICAgICAg ICAgaWYgbGVuKHN4cC5jaGlsZHJlbihuZXdfZGV2X3N4cCwgJ2RldicpKSA9PSAwOgogICAg ICAgICAgICAgICAgIGRlbCBzZWxmLmluZm9bJ2RldmljZXMnXVtkZXZfdXVpZF0KLSAgICAg ICAgICAgICAgICBwbGF0Zm9ybSA9IHNlbGYuaW5mb1sncGxhdGZvcm0nXQotICAgICAgICAg ICAgICAgIG9yaWdfZGV2X251bSA9IGxlbihwbGF0Zm9ybVsncGNpJ10pCi0gICAgICAgICAg ICAgICAgIyBUT0RPOiBjYW4gdXNlIHRoaXMgdG8ga2VlcCBzb21lIGluZm8gdG8gYXNrIGhp Z2ggbGV2ZWwKLSAgICAgICAgICAgICAgICAjIG1hbmFnZW1lbnQgdG9vbHMgdG8gaG90IGlu c2VydCBhIG5ldyBwYXNzdGhyb3VnaCBkZXYKLSAgICAgICAgICAgICAgICAjIGFmdGVyIG1p Z3JhdGlvbgotICAgICAgICAgICAgICAgIGlmIG9yaWdfZGV2X251bSAhPSAwOgotICAgICAg ICAgICAgICAgICAgICAjcGxhdGZvcm1bJ3BjaSddID0gWyIlZERFVnMiICUgb3JpZ19kZXZf bnVtXQotICAgICAgICAgICAgICAgICAgICBwbGF0Zm9ybVsncGNpJ10gPSBbXQotICAgICAg ICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICBzZWxmLmRlc3Ryb3lEZXZpY2UoJ3BjaScs IGRldmlkKQotICAgICAgICAgICAgICAgIGRlbCBzZWxmLmluZm9bJ2RldmljZXMnXVtkZXZf dXVpZF0KKyAgICAgICAgICAgICAgICBpZiBzZWxmLmluZm8uaXNfaHZtKCk6CisgICAgICAg ICAgICAgICAgICAgIHBsYXRmb3JtID0gc2VsZi5pbmZvWydwbGF0Zm9ybSddCisgICAgICAg ICAgICAgICAgICAgIG9yaWdfZGV2X251bSA9IGxlbihwbGF0Zm9ybVsncGNpJ10pCisgICAg ICAgICAgICAgICAgICAgICMgVE9ETzogY2FuIHVzZSB0aGlzIHRvIGtlZXAgc29tZSBpbmZv IHRvIGFzayBoaWdoIGxldmVsCisgICAgICAgICAgICAgICAgICAgICMgbWFuYWdlbWVudCB0 b29scyB0byBob3QgaW5zZXJ0IGEgbmV3IHBhc3N0aHJvdWdoIGRldgorICAgICAgICAgICAg ICAgICAgICAjIGFmdGVyIG1pZ3JhdGlvbgorICAgICAgICAgICAgICAgICAgICBpZiBvcmln X2Rldl9udW0gIT0gMDoKKyAgICAgICAgICAgICAgICAgICAgICAgICNwbGF0Zm9ybVsncGNp J10gPSBbIiVkREVWcyIgJSBvcmlnX2Rldl9udW1dCisgICAgICAgICAgICAgICAgICAgICAg ICBwbGF0Zm9ybVsncGNpJ10gPSBbXQogCiAgICAgICAgIHhlbi54ZW5kLlhlbmREb21haW4u aW5zdGFuY2UoKS5tYW5hZ2VkX2NvbmZpZ19zYXZlKHNlbGYpCiAKQEAgLTEwNTQsNyArMTA5 MSw3IEBAIGNsYXNzIFhlbmREb21haW5JbmZvOgogICAgICAgICAgICAgcmFpc2UgVm1FcnJv cigiRGV2aWNlIEAgdnNsb3QgMHgleCBkb2Vzbid0IGV4aXN0LiIgJSAodnNsb3QpKQogCiAg ICAgICAgIGlmIHZzbG90ID09IEFVVE9fUEhQX1NMT1Q6Ci0gICAgICAgICAgICByYWlzZSBW bUVycm9yKCJEZXZpY2UgQCB2c2xvdCAweCV4IGRvIG5vdCBzdXBwb3J0IGhvdHBsdWcuIiAl ICh2c2xvdCkpCisgICAgICAgICAgICByYWlzZSBWbUVycm9yKCJEZXZpY2UgQCB2c2xvdCAw eCV4IGRvZXNuJ3Qgc3VwcG9ydCBob3RwbHVnLiIgJSAodnNsb3QpKQogCiAgICAgICAgICMg Q2hlY2sgdGhlIGNvLWFzc2lnbm1lbnQuCiAgICAgICAgICMgVG8gcGNpLWRldGFjaCBhIGRl dmljZSBEIGZyb20gZG9tTiwgd2Ugc2hvdWxkIGVuc3VyZTogZm9yIGVhY2ggREQgaW4gdGhl CkBAIC0xMDcyLDE5ICsxMTA5LDIwIEBAIGNsYXNzIFhlbmREb21haW5JbmZvOgogICAgICAg ICAgICAgICAgICAgICAicGFyc2UgaXQncyByZXNvdXJjZXMgLSAiK3N0cihlKSkKICAgICAg ICAgY29hc3NpZ25tZW50X2xpc3QgPSBwY2lfZGV2aWNlLmZpbmRfY29hc3NpZ25lZF9kZXZp Y2VzKCkKICAgICAgICAgY29hc3NpZ25tZW50X2xpc3QucmVtb3ZlKHBjaV9kZXZpY2UubmFt ZSkKLSAgICAgICAgYXNzaWduZWRfcGNpX2RldmljZV9zdHJfbGlzdCA9IGdldF9hc3NpZ25l ZF9wY2lfZGV2aWNlcyhzZWxmLmRvbWlkKQorICAgICAgICBhc3NpZ25lZF9wY2lfZGV2aWNl X3N0cl9saXN0ID0gc2VsZi5fZ2V0X2Fzc2lnbmVkX3BjaV9kZXZpY2VzKCkKICAgICAgICAg Zm9yIHBjaV9zdHIgaW4gY29hc3NpZ25tZW50X2xpc3Q6CiAgICAgICAgICAgICBpZiBwY2lf c3RyIGluIGFzc2lnbmVkX3BjaV9kZXZpY2Vfc3RyX2xpc3Q6Ci0gICAgICAgICAgICAgICAg cmFpc2UgVm1FcnJvcigoJ3BjaTogZmFpbGVkIHRvIHBjaS1kZXRhY2ggJXMgZnJvbSBkb20l ZCIgKyBcCisgICAgICAgICAgICAgICAgcmFpc2UgVm1FcnJvcigoInBjaTogZmFpbGVkIHRv IHBjaS1kZXRhY2ggJXMgZnJvbSBkb21haW4gJXMiICsgXAogICAgICAgICAgICAgICAgICAg ICAiIGJlY2F1c2Ugb25lIG9mIGl0cyBjby1hc3NpZ25tZW50IGRldmljZSAlcyBpcyBzdGls bCAiICsgXAotICAgICAgICAgICAgICAgICAgICAiIGFzc2lnbmVkIHRvIHRoZSBkb21haW4u JyBcCi0gICAgICAgICAgICAgICAgICAgICklIChwY2lfZGV2aWNlLm5hbWUsIHNlbGYuZG9t aWQsIHBjaV9zdHIpKQorICAgICAgICAgICAgICAgICAgICAiIGFzc2lnbmVkIHRvIHRoZSBk b21haW4uIiBcCisgICAgICAgICAgICAgICAgICAgICklIChwY2lfZGV2aWNlLm5hbWUsIHNl bGYuaW5mb1snbmFtZV9sYWJlbCddLCBwY2lfc3RyKSkKIAogCiAgICAgICAgIGJkZl9zdHIg PSAiJXM6JXM6JXMuJXMiICUgKHhbJ2RvbWFpbiddLCB4WydidXMnXSwgeFsnc2xvdCddLCB4 WydmdW5jJ10pCiAgICAgICAgIGxvZy5pbmZvKCJodm1fZGVzdHJveVBDSURldmljZTolczol cyEiLCB4LCBiZGZfc3RyKQogCi0gICAgICAgIHNlbGYuaW1hZ2Uuc2lnbmFsRGV2aWNlTW9k ZWwoJ3BjaS1yZW0nLCAncGNpLXJlbW92ZWQnLCBiZGZfc3RyKQorICAgICAgICBpZiBzZWxm LmRvbWlkIGlzIG5vdCBOb25lOgorICAgICAgICAgICAgc2VsZi5pbWFnZS5zaWduYWxEZXZp Y2VNb2RlbCgncGNpLXJlbScsICdwY2ktcmVtb3ZlZCcsIGJkZl9zdHIpCiAKICAgICAgICAg cmV0dXJuIDAKIApAQCAtMTIzMyw2ICsxMjcxLDI2IEBAIGNsYXNzIFhlbmREb21haW5JbmZv OgogICAgICAgICAgICAgaWYgZGV2aWQgPT0gaW50KHN4cC5jaGlsZF92YWx1ZShkZXZzWzBd LCAnZGV2aWQnKSk6CiAgICAgICAgICAgICAgICAgcmV0dXJuIGRldl9pbmZvCiAgICAgICAg IHJldHVybiBOb25lCisKKyAgICBkZWYgX2dldF9hc3NpZ25lZF9wY2lfZGV2aWNlcyhzZWxm LCBkZXZpZCA9IDApOgorICAgICAgICBpZiBzZWxmLmRvbWlkIGlzIG5vdCBOb25lOgorICAg ICAgICAgICAgcmV0dXJuIGdldF9hc3NpZ25lZF9wY2lfZGV2aWNlcyhzZWxmLmRvbWlkKQor CisgICAgICAgIGRldl9zdHJfbGlzdCA9IFtdCisgICAgICAgIGRldl9pbmZvID0gc2VsZi5f Z2V0RGV2aWNlSW5mb19wY2koZGV2aWQpCisgICAgICAgIGlmIGRldl9pbmZvIGlzIE5vbmU6 CisgICAgICAgICAgICByZXR1cm4gZGV2X3N0cl9saXN0CisgICAgICAgIGRldl91dWlkID0g c3hwLmNoaWxkX3ZhbHVlKGRldl9pbmZvLCAndXVpZCcpCisgICAgICAgIHBjaV9jb25mID0g c2VsZi5pbmZvWydkZXZpY2VzJ11bZGV2X3V1aWRdWzFdCisgICAgICAgIHBjaV9kZXZzID0g cGNpX2NvbmZbJ2RldnMnXQorICAgICAgICBmb3IgcGNpX2RldiBpbiBwY2lfZGV2czoKKyAg ICAgICAgICAgIGRvbWFpbiA9IGludChwY2lfZGV2Wydkb21haW4nXSwgMTYpCisgICAgICAg ICAgICBidXMgPSBpbnQocGNpX2RldlsnYnVzJ10sIDE2KQorICAgICAgICAgICAgc2xvdCA9 IGludChwY2lfZGV2WydzbG90J10sIDE2KQorICAgICAgICAgICAgZnVuYyA9IGludChwY2lf ZGV2WydmdW5jJ10sIDE2KQorICAgICAgICAgICAgZGV2X3N0ciA9ICIlMDR4OiUwMng6JTAy eC4lMDF4IiAlIChkb21haW4sIGJ1cywgc2xvdCwgZnVuYykKKyAgICAgICAgICAgIGRldl9z dHJfbGlzdCA9IGRldl9zdHJfbGlzdCArIFtkZXZfc3RyXQorICAgICAgICByZXR1cm4gZGV2 X3N0cl9saXN0IAogCiAgICAgZGVmIHNldE1lbW9yeVRhcmdldChzZWxmLCB0YXJnZXQpOgog ICAgICAgICAiIiJTZXQgdGhlIG1lbW9yeSB0YXJnZXQgb2YgdGhpcyBkb21haW4uCg== --Boundary-TxVrAKyFNmm6GpIv34BQ4 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --Boundary-TxVrAKyFNmm6GpIv34BQ4--