From: Masaki Kanno Subject: [PATCH] xend: Update info['platform']['pci'] Date: Thu, 28 May 2009 16:01:50 +0900 Message-ID: <78C9DF622C5003kanno.masaki@jp.fujitsu.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-C3nMk0IjuS2h6ocwMJpn0" 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 Cc: horms@verge.net.au List-Id: xen-devel@lists.xenproject.org --Boundary-C3nMk0IjuS2h6ocwMJpn0 Content-Type: text/plain; charset=iso-2022-jp Content-Transfer-Encoding: 7bit Content-Description: Mail message body Hi, This patch updates info['platform']['pci'] for PCI devices assignment to domains. When a domain is started, xend confirms by using xc.test_assign_device whether PCI devices can be assigned to the domain. For the confirmation, info['platform']['pci'] must be an appropriate value. However, info['platform']['pci'] may be not appropriate. Because info['platform']['pci'] isn't almost always updated even if the PCI device configuration of the domain was changed by using xm pci-attach/detach. This patch updates info['platform']['pci'] to the appropriate value when domains are started. Cc: Simon Horman Signed-off-by: Masaki Kanno Best regards, Kan --Boundary-C3nMk0IjuS2h6ocwMJpn0 Content-Type: application/octet-stream; name="update_platform_pci.patch" Content-Disposition: attachment; filename="update_platform_pci.patch" Content-Transfer-Encoding: base64 ZGlmZiAtciBmZTY4NDA1MjAxZDIgdG9vbHMvcHl0aG9uL3hlbi91dGlsL3BjaS5weQotLS0g YS90b29scy9weXRob24veGVuL3V0aWwvcGNpLnB5CVdlZCBNYXkgMjcgMTU6NTU6MjkgMjAw OSArMDEwMAorKysgYi90b29scy9weXRob24veGVuL3V0aWwvcGNpLnB5CVRodSBNYXkgMjgg MTE6NTY6NDQgMjAwOSArMDkwMApAQCAtMTQsNiArMTQsNyBAQAogaW1wb3J0IHRpbWUKIGlt cG9ydCB0aHJlYWRpbmcKIGZyb20geGVuLnV0aWwgaW1wb3J0IHV0aWxzCitmcm9tIHhlbi54 ZW5kIGltcG9ydCBzeHAKIAogUFJPQ19QQ0lfUEFUSCA9ICcvcHJvYy9idXMvcGNpL2Rldmlj ZXMnCiBQUk9DX1BDSV9OVU1fUkVTT1VSQ0VTID0gNwpAQCAtMTQwLDEwICsxNDEsMTcgQEAK ICAgICByZXR1cm4gKGRvbWFpbiwgYnVzLCBzbG90LCBmdW5jKQogCiBkZWYgYXNzaWduZWRf b3JfcmVxdWVzdGVkX3ZzbG90KGRldik6Ci0gICAgaWYgZGV2Lmhhc19rZXkoInZzbG90Iik6 Ci0gICAgICAgIHJldHVybiBkZXZbInZzbG90Il0KLSAgICBpZiBkZXYuaGFzX2tleSgicmVx dWVzdGVkX3ZzbG90Iik6Ci0gICAgICAgIHJldHVybiBkZXZbInJlcXVlc3RlZF92c2xvdCJd CisgICAgaWYgaXNpbnN0YW5jZShkZXYsIHR5cGVzLkRpY3RUeXBlKToKKyAgICAgICAgaWYg ZGV2Lmhhc19rZXkoInZzbG90Iik6CisgICAgICAgICAgICByZXR1cm4gZGV2WyJ2c2xvdCJd CisgICAgICAgIGlmIGRldi5oYXNfa2V5KCJyZXF1ZXN0ZWRfdnNsb3QiKToKKyAgICAgICAg ICAgIHJldHVybiBkZXZbInJlcXVlc3RlZF92c2xvdCJdCisgICAgZWxpZiBpc2luc3RhbmNl KGRldiwgKHR5cGVzLkxpc3RUeXBlLCB0eXBlcy5UdXBsZVR5cGUpKToKKyAgICAgICAgdnNs b3QgPSBzeHAuY2hpbGRfdmFsdWUoZGV2LCAndnNsb3QnLCBOb25lKQorICAgICAgICBpZiBu b3QgdnNsb3Q6CisgICAgICAgICAgICB2c2xvdCA9IHN4cC5jaGlsZF92YWx1ZShkZXYsICdy ZXF1ZXN0ZWRfdnNsb3QnLCBOb25lKQorICAgICAgICBpZiB2c2xvdDoKKyAgICAgICAgICAg IHJldHVybiB2c2xvdAogICAgIHJhaXNlIFBjaURldmljZVZzbG90TWlzc2luZygiJXMiICUg ZGV2KQogCiBkZWYgZmluZF9zeXNmc19tbnQoKToKZGlmZiAtciBmZTY4NDA1MjAxZDIgdG9v bHMvcHl0aG9uL3hlbi94ZW5kL1hlbmRDb25maWcucHkKLS0tIGEvdG9vbHMvcHl0aG9uL3hl bi94ZW5kL1hlbmRDb25maWcucHkJV2VkIE1heSAyNyAxNTo1NToyOSAyMDA5ICswMTAwCisr KyBiL3Rvb2xzL3B5dGhvbi94ZW4veGVuZC9YZW5kQ29uZmlnLnB5CVRodSBNYXkgMjggMTE6 NTY6NDQgMjAwOSArMDkwMApAQCAtMzcsNiArMzcsNyBAQAogZnJvbSB4ZW4ueGVuZC5zZXJ2 ZXIuQmxrdGFwQ29udHJvbGxlciBpbXBvcnQgYmxrdGFwX2Rpc2tfdHlwZXMKIGZyb20geGVu LnhlbmQuc2VydmVyLm5ldGlmIGltcG9ydCByYW5kb21NQUMKIGZyb20geGVuLnV0aWwuYmxr aWYgaW1wb3J0IGJsa2Rldl9uYW1lX3RvX251bWJlciwgYmxrZGV2X3VuYW1lX3RvX2ZpbGUK K2Zyb20geGVuLnV0aWwucGNpIGltcG9ydCBhc3NpZ25lZF9vcl9yZXF1ZXN0ZWRfdnNsb3QK IGZyb20geGVuLnV0aWwgaW1wb3J0IHhzY29uc3RhbnRzCiBpbXBvcnQgeGVuLnV0aWwuYXV4 YmluCiAKQEAgLTIxODYsMyArMjE4NywyNiBAQAogCiAgICAgZGVmIGlzX2hhcChzZWxmKToK ICAgICAgICAgcmV0dXJuIHNlbGZbJ3BsYXRmb3JtJ10uZ2V0KCdoYXAnLCAwKQorCisgICAg ZGVmIHVwZGF0ZV9wbGF0Zm9ybV9wY2koc2VsZik6CisgICAgICAgIGlmIG5vdCBzZWxmLmlz X2h2bSgpOgorICAgICAgICAgICAgcmV0dXJuCisKKyAgICAgICAgcGNpID0gW10KKyAgICAg ICAgZm9yIGRldl90eXBlLCBkZXZfaW5mbyBpbiBzZWxmLmFsbF9kZXZpY2VzX3N4cHIoKToK KyAgICAgICAgICAgIGlmIGRldl90eXBlICE9ICdwY2knOgorICAgICAgICAgICAgICAgIGNv bnRpbnVlCisgICAgICAgICAgICBmb3IgZGV2IGluIHN4cC5jaGlsZHJlbihkZXZfaW5mbywg J2RldicpOgorICAgICAgICAgICAgICAgIGRvbWFpbiA9IHN4cC5jaGlsZF92YWx1ZShkZXYs ICdkb21haW4nKQorICAgICAgICAgICAgICAgIGJ1cyA9IHN4cC5jaGlsZF92YWx1ZShkZXYs ICdidXMnKQorICAgICAgICAgICAgICAgIHNsb3QgPSBzeHAuY2hpbGRfdmFsdWUoZGV2LCAn c2xvdCcpCisgICAgICAgICAgICAgICAgZnVuYyA9IHN4cC5jaGlsZF92YWx1ZShkZXYsICdm dW5jJykKKyAgICAgICAgICAgICAgICB2c2xvdCA9IGFzc2lnbmVkX29yX3JlcXVlc3RlZF92 c2xvdChkZXYpIAorICAgICAgICAgICAgICAgIG9wdHMgPSAnJworICAgICAgICAgICAgICAg IGZvciBvcHQgaW4gc3hwLmNoaWxkX3ZhbHVlKGRldiwgJ29wdHMnLCBbXSk6CisgICAgICAg ICAgICAgICAgICAgIGlmIG9wdHM6CisgICAgICAgICAgICAgICAgICAgICAgICBvcHRzICs9 ICcsJworICAgICAgICAgICAgICAgICAgICBvcHRzICs9ICclcz0lcycgJSAob3B0WzBdLCBz dHIob3B0WzFdKSkKKyAgICAgICAgICAgICAgICBwY2kuYXBwZW5kKFtkb21haW4sIGJ1cywg c2xvdCwgZnVuYywgdnNsb3QsIG9wdHNdKQorICAgICAgICBzZWxmWydwbGF0Zm9ybSddWydw Y2knXSA9IHBjaQorCmRpZmYgLXIgZmU2ODQwNTIwMWQyIHRvb2xzL3B5dGhvbi94ZW4veGVu ZC9YZW5kRG9tYWluSW5mby5weQotLS0gYS90b29scy9weXRob24veGVuL3hlbmQvWGVuZERv bWFpbkluZm8ucHkJV2VkIE1heSAyNyAxNTo1NToyOSAyMDA5ICswMTAwCisrKyBiL3Rvb2xz L3B5dGhvbi94ZW4veGVuZC9YZW5kRG9tYWluSW5mby5weQlUaHUgTWF5IDI4IDExOjU2OjQ0 IDIwMDkgKzA5MDAKQEAgLTg5MywxOCArODkzLDkgQEAKICAgICAgICAgICAgIGlmIG51bV9k ZXZzID09IDA6CiAgICAgICAgICAgICAgICAgaWYgc2VsZi5pbmZvLmlzX2h2bSgpOgogICAg ICAgICAgICAgICAgICAgICBzZWxmLmRlc3Ryb3lEZXZpY2UoJ3BjaScsIGRldmlkLCBUcnVl KQotICAgICAgICAgICAgICAgICAgICBkZWwgc2VsZi5pbmZvWydkZXZpY2VzJ11bZGV2X3V1 aWRdCi0gICAgICAgICAgICAgICAgICAgIHBsYXRmb3JtID0gc2VsZi5pbmZvWydwbGF0Zm9y bSddCi0gICAgICAgICAgICAgICAgICAgIG9yaWdfZGV2X251bSA9IGxlbihwbGF0Zm9ybVsn cGNpJ10pCi0gICAgICAgICAgICAgICAgICAgICMgVE9ETzogY2FuIHVzZSB0aGlzIHRvIGtl ZXAgc29tZSBpbmZvIHRvIGFzayBoaWdoIGxldmVsCi0gICAgICAgICAgICAgICAgICAgICMg bWFuYWdlbWVudCB0b29scyB0byBob3QgaW5zZXJ0IGEgbmV3IHBhc3N0aHJvdWdoIGRldgot ICAgICAgICAgICAgICAgICAgICAjIGFmdGVyIG1pZ3JhdGlvbgotICAgICAgICAgICAgICAg ICAgICBpZiBvcmlnX2Rldl9udW0gIT0gMDoKLSAgICAgICAgICAgICAgICAgICAgICAgICNw bGF0Zm9ybVsncGNpJ10gPSBbIiVkREVWcyIgJSBvcmlnX2Rldl9udW1dCi0gICAgICAgICAg ICAgICAgICAgICAgICBwbGF0Zm9ybVsncGNpJ10gPSBbXQogICAgICAgICAgICAgICAgIGVs c2U6CiAgICAgICAgICAgICAgICAgICAgIHNlbGYuZGVzdHJveURldmljZSgncGNpJywgZGV2 aWQpCi0gICAgICAgICAgICAgICAgICAgIGRlbCBzZWxmLmluZm9bJ2RldmljZXMnXVtkZXZf dXVpZF0KKyAgICAgICAgICAgICAgICBkZWwgc2VsZi5pbmZvWydkZXZpY2VzJ11bZGV2X3V1 aWRdCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBuZXdfZGV2X3N4cCA9IFsncGNpJ10K ICAgICAgICAgICAgIGZvciBjdXJfZGV2IGluIHN4cC5jaGlsZHJlbihleGlzdGluZ19kZXZf aW5mbywgJ2RldicpOgpAQCAtOTIzLDE4ICs5MTQsOSBAQAogICAgICAgICAgICAgZGV2X3V1 aWQgPSBzeHAuY2hpbGRfdmFsdWUoZXhpc3RpbmdfZGV2X2luZm8sICd1dWlkJykKICAgICAg ICAgICAgIHNlbGYuaW5mby5kZXZpY2VfdXBkYXRlKGRldl91dWlkLCBuZXdfZGV2X3N4cCkK IAotICAgICAgICAgICAgIyBJZiB0aGVyZSBpcyBvbmx5ICd2c2NzaScgaW4gbmV3X2Rldl9z eHAsIHJlbW92ZSB0aGUgY29uZmlnLgorICAgICAgICAgICAgIyBJZiB0aGVyZSBpcyBubyBk ZXZpY2UgbGVmdCwgcmVtb3ZlIGNvbmZpZy4KICAgICAgICAgICAgIGlmIGxlbihzeHAuY2hp bGRyZW4obmV3X2Rldl9zeHAsICdkZXYnKSkgPT0gMDoKICAgICAgICAgICAgICAgICBkZWwg c2VsZi5pbmZvWydkZXZpY2VzJ11bZGV2X3V1aWRdCi0gICAgICAgICAgICAgICAgaWYgc2Vs Zi5pbmZvLmlzX2h2bSgpOgotICAgICAgICAgICAgICAgICAgICBwbGF0Zm9ybSA9IHNlbGYu aW5mb1sncGxhdGZvcm0nXQotICAgICAgICAgICAgICAgICAgICBvcmlnX2Rldl9udW0gPSBs ZW4ocGxhdGZvcm1bJ3BjaSddKQotICAgICAgICAgICAgICAgICAgICAjIFRPRE86IGNhbiB1 c2UgdGhpcyB0byBrZWVwIHNvbWUgaW5mbyB0byBhc2sgaGlnaCBsZXZlbAotICAgICAgICAg ICAgICAgICAgICAjIG1hbmFnZW1lbnQgdG9vbHMgdG8gaG90IGluc2VydCBhIG5ldyBwYXNz dGhyb3VnaCBkZXYKLSAgICAgICAgICAgICAgICAgICAgIyBhZnRlciBtaWdyYXRpb24KLSAg ICAgICAgICAgICAgICAgICAgaWYgb3JpZ19kZXZfbnVtICE9IDA6Ci0gICAgICAgICAgICAg ICAgICAgICAgICAjcGxhdGZvcm1bJ3BjaSddID0gWyIlZERFVnMiICUgb3JpZ19kZXZfbnVt XQotICAgICAgICAgICAgICAgICAgICAgICAgcGxhdGZvcm1bJ3BjaSddID0gW10KIAogICAg ICAgICB4ZW4ueGVuZC5YZW5kRG9tYWluLmluc3RhbmNlKCkubWFuYWdlZF9jb25maWdfc2F2 ZShzZWxmKQogCkBAIC0yNDYzLDYgKzI0NDUsNyBAQAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgKHNlbGYuZ2V0VkNwdUNvdW50KCkgKiAxMDApKQogCiAgICAgICAgICMgVGVz dCB3aGV0aGVyIHRoZSBkZXZpY2VzIGNhbiBiZSBhc3NpZ25lZCB3aXRoIFZULWQKKyAgICAg ICAgc2VsZi5pbmZvLnVwZGF0ZV9wbGF0Zm9ybV9wY2koKQogICAgICAgICBwY2kgPSBzZWxm LmluZm9bInBsYXRmb3JtIl0uZ2V0KCJwY2kiKQogICAgICAgICBwY2lfc3RyID0gJycKICAg ICAgICAgaWYgcGNpIGFuZCBsZW4ocGNpKSA+IDA6CmRpZmYgLXIgZmU2ODQwNTIwMWQyIHRv b2xzL3B5dGhvbi94ZW4veGVuZC9zZXJ2ZXIvcGNpaWYucHkKLS0tIGEvdG9vbHMvcHl0aG9u L3hlbi94ZW5kL3NlcnZlci9wY2lpZi5weQlXZWQgTWF5IDI3IDE1OjU1OjI5IDIwMDkgKzAx MDAKKysrIGIvdG9vbHMvcHl0aG9uL3hlbi94ZW5kL3NlcnZlci9wY2lpZi5weQlUaHUgTWF5 IDI4IDExOjU2OjQ0IDIwMDkgKzA5MDAKQEAgLTIyMyw2ICsyMjMsMTEgQEAKICAgICAgICAg ICAgICAgICAgICAgZXhjZXB0IEluZGV4RXJyb3I6CiAgICAgICAgICAgICAgICAgICAgICAg ICBkZXZfZGljdFsndnNsb3QnXSA9IEFVVE9fUEhQX1NMT1RfU1RSCiAKKyAgICAgICAgICAg ICAgICAjYXBwZW5kIG9wdHMgaW5mbworICAgICAgICAgICAgICAgIG9wdHMgPSBzZWxmLnJl YWRCYWNrZW5kKGRldmlkLCAnb3B0cy0lZCcgJSBpKQorICAgICAgICAgICAgICAgIGlmIG9w dHMgaXMgbm90IE5vbmU6CisgICAgICAgICAgICAgICAgICAgIGRldl9kaWN0WydvcHRzJ10g PSBvcHRzCisKICAgICAgICAgICAgICAgICBwY2lfZGV2cy5hcHBlbmQoZGV2X2RpY3QpCiAK ICAgICAgICAgcmVzdWx0WydkZXZzJ10gPSBwY2lfZGV2cwpAQCAtMjQzLDggKzI0OCwxNCBA QAogICAgICAgICAKICAgICAgICAgZm9yIGRldiBpbiBkZXZzOgogICAgICAgICAgICAgZGV2 X3N4cHIgPSBbJ2RldiddCi0gICAgICAgICAgICBmb3IgZGV2X2l0ZW0gaW4gZGV2Lml0ZW1z KCk6Ci0gICAgICAgICAgICAgICAgZGV2X3N4cHIuYXBwZW5kKGxpc3QoZGV2X2l0ZW0pKQor ICAgICAgICAgICAgZm9yIGRldl9rZXksIGRldl92YWwgaW4gZGV2Lml0ZW1zKCk6CisgICAg ICAgICAgICAgICAgaWYgZGV2X2tleSA9PSAnb3B0cyc6CisgICAgICAgICAgICAgICAgICAg IG9wdHMgPSBbXQorICAgICAgICAgICAgICAgICAgICBmb3Igb3B0IGluIGRldl92YWwuc3Bs aXQoJywnKToKKyAgICAgICAgICAgICAgICAgICAgICAgIG9wdHMuYXBwZW5kKG9wdC5zcGxp dCgnPScpKQorICAgICAgICAgICAgICAgICAgICBkZXZfc3hwci5hcHBlbmQoWydvcHRzJywg b3B0c10pCisgICAgICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICAgICAgZGV2 X3N4cHIuYXBwZW5kKFtkZXZfa2V5LCBkZXZfdmFsXSkKICAgICAgICAgICAgIHN4cHIuYXBw ZW5kKGRldl9zeHByKQogICAgICAgICAKICAgICAgICAgZm9yIGtleSwgdmFsIGluIGNvbmZp Z0RpY3QuaXRlbXMoKToK --Boundary-C3nMk0IjuS2h6ocwMJpn0 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-C3nMk0IjuS2h6ocwMJpn0--