From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yosuke Iwamatsu Subject: [PATCH] Xend: Fix PCI Device Configuration Date: Mon, 17 Dec 2007 18:30:47 +0900 Message-ID: <476641C7.9060808@ab.jp.nec.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------080304060404050604030501" 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 This is a multi-part message in MIME format. --------------080304060404050604030501 Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Xend doesn't correctly work after restart, when there is a domU which owns a pci device (driver domain). This patch fixes the problem. Regards, ------------------- Yosuke Iwamatsu NEC Corporation --------------080304060404050604030501 Content-Type: text/plain; name="pci_config.patch" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="pci_config.patch" IyBIRyBjaGFuZ2VzZXQgcGF0Y2gKIyBVc2VyIHktaXdhbWF0c3VAYWIuanAubmVjLmNvbQoj IERhdGUgMTE5Nzg3MDgxNSAtMzI0MDAKIyBOb2RlIElEIGE3MGZmYzQ4OWFlMmEyZjYyNDE1 ZGZmYWRjNDNkN2E0YmFkYjE5NmIKIyBQYXJlbnQgIDk2NmE2ZDNiNzQwODc0NzRkZjMzN2Uw MGIzMWNiZWNmNDk1YjQ0MmEKWGVuZDogRml4IHBjaSBkZXZpY2UgY29uZmlndXJhdGlvbnMu CgpYZW5kIGRvZXNuJ3QgY29ycmVjdGx5IHdvcmsgYWZ0ZXIgcmVzdGFydCB3aGVuIHRoZXJl IGlzIGEgZG9tVSB3aGljaCBvd25zCmEgcGNpIGRldmljZS4gVGhpcyBpcyBjYXVzZWQgYnkg dHdvIHJlYXNvbnM6CgoxKSBQY2kgZGV2aWNlcyBoYXZlIGEgZGlmZmVyZW50IGNvbmZpZ3Vy YXRpb24gZm9ybWF0IGZyb20gcmVndWxhciBkZXZpY2VzLgpYZW5kIHRyZWF0cyBwY2kgZGV2 aWNlIGNvbmZpZ3VyYXRpb25zIGRpc3RpbmN0bHkgYXQgc3RhcnR1cCwgYnV0IG5vdCBhdApy ZXN0YXJ0LiBUaGlzIHBhdGNoIG1ha2VzIHhlbmQgY29ycmVjdGx5IHBhcnNlIHBjaSBkZXZp Y2UgY29uZmlndXJhdGlvbnMKYm90aCBhdCBzdGFydHVwIGFuZCBhdCByZXN0YXJ0LgoKMikg Y29uZmlndXJhdGlvbigpIGZ1bmN0aW9uIGluIFBjaUNvbnRyb2xsZXIgY2xhc3Mgc2hvdWxk IGhhdmUgYW4gYWRkaXRpb25hbAphcmd1bWVudCAndHJhbnNhY3Rpb24nLiAKClNpZ25lZC1v ZmYtYnk6IFlvc3VrZSBJd2FtYXRzdSA8eS1pd2FtYXRzdUBhYi5qcC5uZWMuY29tPgoKZGlm ZiAtciA5NjZhNmQzYjc0MDggLXIgYTcwZmZjNDg5YWUyIHRvb2xzL3B5dGhvbi94ZW4veGVu ZC9YZW5kQ29uZmlnLnB5Ci0tLSBhL3Rvb2xzL3B5dGhvbi94ZW4veGVuZC9YZW5kQ29uZmln LnB5CUZyaSBEZWMgMTQgMTE6NTA6MjQgMjAwNyArMDAwMAorKysgYi90b29scy9weXRob24v eGVuL3hlbmQvWGVuZENvbmZpZy5weQlNb24gRGVjIDE3IDE0OjUzOjM1IDIwMDcgKzA5MDAK QEAgLTUzMyw1NSArNTMzLDEzIEBAIGNsYXNzIFhlbmRDb25maWcoZGljdCk6CiAgICAgICAg ICAgICBjZmdbJ0hWTV9ib290X3BvbGljeSddID0gJ0JJT1Mgb3JkZXInCiAgICAgICAgICAg ICBjZmdbJ0hWTV9ib290X3BhcmFtcyddID0geyAnb3JkZXInIDogYm9vdF9vcmRlciB9CiAK LSAgICAgICAgIyBQYXJzaW5nIHRoZSBkZXZpY2UgU1hQJ3MuIEluIG1vc3QgY2FzZXMsIHRo ZSBTWFAgbG9va3MKLSAgICAgICAgIyBsaWtlIHRoaXM6Ci0gICAgICAgICMKLSAgICAgICAg IyBbZGV2aWNlLCBbdmlmLCBbbWFjLCB4eDp4eDp4eDp4eDp4eDp4eF0sIFtpcCAxLjMuNC41 XV1dCi0gICAgICAgICMKLSAgICAgICAgIyBIb3dldmVyLCBmb3IgUENJIGRldmljZXMgaXQg bG9va3MgbGlrZSB0aGlzOgotICAgICAgICAjCi0gICAgICAgICMgW2RldmljZSwgW3BjaSwg W2RldiwgW2RvbWFpbiwgMF0sIFtidXMsIDBdLCBbc2xvdCwgMV1dXV0KLSAgICAgICAgIwot ICAgICAgICAjIEl0IHNlZW1zIHRoZSByZWFzb25pbmcgZm9yIHRoaXMgZGlmZmVyZW5jZSBp cyBiZWNhdXNlCi0gICAgICAgICMgcGNpaWYucHkgbmVlZHMgYWxsIHRoZSBQQ0kgZGV2aWNl IGNvbmZpZ3VyYXRpb25zIGF0Ci0gICAgICAgICMgdGhlIHNhbWUgdGltZSB3aGVuIGNyZWF0 aW5nIHRoZSBkZXZpY2VzLgotICAgICAgICAjCi0gICAgICAgICMgVG8gZnVydGhlciBjb21w bGljYXRlIG1hdHRlcnMsIFhlbiAyLjAgY29uZmlndXJhdGlvbiBmb3JtYXQKLSAgICAgICAg IyB1c2VzIHRoZSBmb2xsb3dpbmcgZm9yIHBjaSBkZXZpY2UgY29uZmlndXJhdGlvbjoKLSAg ICAgICAgIwotICAgICAgICAjIFtkZXZpY2UsIFtwY2ksIFtkb21haW4sIDBdLCBbYnVzLCAw XSwgW2RldiwgMV0sIFtmdW5jLCAyXV1dCi0gICAgICAgICMKLSAgICAgICAgIyBIZW5jZSB3 ZSBkZWFsIHdpdGggcGNpIGRldmljZSBjb25maWd1cmF0aW9ucyBvdXRzaWRlIG9mCi0gICAg ICAgICMgdGhlIHJlZ3VsYXIgZGV2aWNlIHBhcnNpbmcuCi0gICAgICAgIAorICAgICAgIAor ICAgICAgICAjIFBhcnNpbmcgdGhlIGRldmljZSBTWFAncy4KICAgICAgICAgY2ZnWydkZXZp Y2VzJ10gPSB7fQogICAgICAgICBmb3IgZGV2IGluIHN4cC5jaGlsZHJlbihzeHBfY2ZnLCAn ZGV2aWNlJyk6CiAgICAgICAgICAgICBjb25maWcgPSBzeHAuY2hpbGQwKGRldikKICAgICAg ICAgICAgIGRldl90eXBlID0gc3hwLm5hbWUoY29uZmlnKQotICAgICAgICAgICAgZGV2X2lu Zm8gPSB7fQotICAgICAgICAgICAgCi0gICAgICAgICAgICBpZiBkZXZfdHlwZSA9PSAncGNp JzoKLSAgICAgICAgICAgICAgICBwY2lfZGV2c191dWlkID0gc3hwLmNoaWxkX3ZhbHVlKGNv bmZpZywgJ3V1aWQnLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgdXVpZC5jcmVhdGVTdHJpbmcoKSkKLSAgICAgICAgICAgICAgICBwY2lfZGV2 cyA9IFtdCi0gICAgICAgICAgICAgICAgZm9yIHBjaV9kZXYgaW4gc3hwLmNoaWxkcmVuKGNv bmZpZywgJ2RldicpOgotICAgICAgICAgICAgICAgICAgICBwY2lfZGV2X2luZm8gPSB7fQot ICAgICAgICAgICAgICAgICAgICBmb3Igb3B0X3ZhbCBpbiBwY2lfZGV2WzE6XToKLSAgICAg ICAgICAgICAgICAgICAgICAgIHRyeToKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBv cHQsIHZhbCA9IG9wdF92YWwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBwY2lfZGV2 X2luZm9bb3B0XSA9IHZhbAotICAgICAgICAgICAgICAgICAgICAgICAgZXhjZXB0IFR5cGVF cnJvcjoKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBwYXNzCi0gICAgICAgICAgICAg ICAgICAgIHBjaV9kZXZzLmFwcGVuZChwY2lfZGV2X2luZm8pCi0gICAgICAgICAgICAgICAg Ci0gICAgICAgICAgICAgICAgY2ZnWydkZXZpY2VzJ11bcGNpX2RldnNfdXVpZF0gPSAoZGV2 X3R5cGUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgeydkZXZzJzogcGNpX2RldnMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICd1dWlkJzogcGNpX2RldnNfdXVpZH0pCi0gICAgICAgICAg ICAgICAgCi0gICAgICAgICAgICAgICAgbG9nLmRlYnVnKCJYZW5kQ29uZmlnOiByZWFkaW5n IGRldmljZTogJXMiICUgcGNpX2RldnMpCi0gICAgICAgICAgICBlbHNlOgotICAgICAgICAg ICAgICAgIHNlbGYuZGV2aWNlX2FkZChkZXZfdHlwZSwgY2ZnX3N4cCA9IGNvbmZpZywgdGFy Z2V0ID0gY2ZnKQotICAgICAgICAgICAgICAgIGxvZy5kZWJ1ZygiWGVuZENvbmZpZzogcmVh ZGluZyBkZXZpY2U6ICVzIiAlIHNjcnViX3Bhc3N3b3JkKGRldl9pbmZvKSkKKyAgICAgICAg ICAgIHNlbGYuZGV2aWNlX2FkZChkZXZfdHlwZSwgY2ZnX3N4cCA9IGNvbmZpZywgdGFyZ2V0 ID0gY2ZnKQogCiAgICAgICAgICMgRXh0cmFjdCBtaXNzaW5nIGRhdGEgZnJvbSBjb25maWd1 cmF0aW9uIGVudHJpZXMKICAgICAgICAgaW1hZ2Vfc3hwID0gc3hwLmNoaWxkX3ZhbHVlKHN4 cF9jZmcsICdpbWFnZScsIFtdKQpAQCAtMTA5Niw2ICsxMDU0LDQ0IEBAIGNsYXNzIFhlbmRD b25maWcoZGljdCk6CiAgICAgICAgICAgICBkZXZfdHlwZSA9IHN4cC5uYW1lKGNvbmZpZykK ICAgICAgICAgICAgIGRldl9pbmZvID0ge30KIAorICAgICAgICAgICAgIyBQYXJzaW5nIHRo ZSBkZXZpY2UgU1hQJ3MuIEluIG1vc3QgY2FzZXMsIHRoZSBTWFAgbG9va3MKKyAgICAgICAg ICAgICMgbGlrZSB0aGlzOgorICAgICAgICAgICAgIworICAgICAgICAgICAgIyBbZGV2aWNl LCBbdmlmLCBbbWFjLCB4eDp4eDp4eDp4eDp4eDp4eF0sIFtpcCAxLjMuNC41XV1dCisgICAg ICAgICAgICAjCisgICAgICAgICAgICAjIEhvd2V2ZXIsIGZvciBQQ0kgZGV2aWNlcyBpdCBs b29rcyBsaWtlIHRoaXM6CisgICAgICAgICAgICAjCisgICAgICAgICAgICAjIFtkZXZpY2Us IFtwY2ksIFtkZXYsIFtkb21haW4sIDBdLCBbYnVzLCAwXSwgW3Nsb3QsIDFdXV1dCisgICAg ICAgICAgICAjCisgICAgICAgICAgICAjIEl0IHNlZW1zIHRoZSByZWFzb25pbmcgZm9yIHRo aXMgZGlmZmVyZW5jZSBpcyBiZWNhdXNlCisgICAgICAgICAgICAjIHBjaWlmLnB5IG5lZWRz IGFsbCB0aGUgUENJIGRldmljZSBjb25maWd1cmF0aW9ucyBhdAorICAgICAgICAgICAgIyB0 aGUgc2FtZSB0aW1lIHdoZW4gY3JlYXRpbmcgdGhlIGRldmljZXMuCisgICAgICAgICAgICAj CisgICAgICAgICAgICAjIFRvIGZ1cnRoZXIgY29tcGxpY2F0ZSBtYXR0ZXJzLCBYZW4gMi4w IGNvbmZpZ3VyYXRpb24gZm9ybWF0CisgICAgICAgICAgICAjIHVzZXMgdGhlIGZvbGxvd2lu ZyBmb3IgcGNpIGRldmljZSBjb25maWd1cmF0aW9uOgorICAgICAgICAgICAgIworICAgICAg ICAgICAgIyBbZGV2aWNlLCBbcGNpLCBbZG9tYWluLCAwXSwgW2J1cywgMF0sIFtkZXYsIDFd LCBbZnVuYywgMl1dXQorCisgICAgICAgICAgICBpZiBkZXZfdHlwZSA9PSAncGNpJzoKKyAg ICAgICAgICAgICAgICBwY2lfZGV2c191dWlkID0gc3hwLmNoaWxkX3ZhbHVlKGNvbmZpZywg J3V1aWQnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgdXVpZC5jcmVhdGVTdHJpbmcoKSkKKyAgICAgICAgICAgICAgICBwY2lfZGV2cyA9IFtd CisgICAgICAgICAgICAgICAgZm9yIHBjaV9kZXYgaW4gc3hwLmNoaWxkcmVuKGNvbmZpZywg J2RldicpOgorICAgICAgICAgICAgICAgICAgICBwY2lfZGV2X2luZm8gPSB7fQorICAgICAg ICAgICAgICAgICAgICBmb3Igb3B0X3ZhbCBpbiBwY2lfZGV2WzE6XToKKyAgICAgICAgICAg ICAgICAgICAgICAgIHRyeToKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBvcHQsIHZh bCA9IG9wdF92YWwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBwY2lfZGV2X2luZm9b b3B0XSA9IHZhbAorICAgICAgICAgICAgICAgICAgICAgICAgZXhjZXB0IFR5cGVFcnJvcjoK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICBwYXNzCisgICAgICAgICAgICAgICAgICAg IHBjaV9kZXZzLmFwcGVuZChwY2lfZGV2X2luZm8pCisgICAgICAgICAgICAgICAgdGFyZ2V0 WydkZXZpY2VzJ11bcGNpX2RldnNfdXVpZF0gPSAoZGV2X3R5cGUsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgeydkZXZzJzogcGNpX2Rl dnMsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICd1dWlkJzogcGNpX2RldnNfdXVpZH0pCisKKyAgICAgICAgICAgICAgICBsb2cuZGVi dWcoIlhlbmRDb25maWc6IHJlYWRpbmcgZGV2aWNlOiAlcyIgJSBwY2lfZGV2cykKKyAgICAg ICAgICAgICAgICByZXR1cm4gcGNpX2RldnNfdXVpZAorCiAgICAgICAgICAgICBmb3Igb3B0 X3ZhbCBpbiBjb25maWdbMTpdOgogICAgICAgICAgICAgICAgIHRyeToKICAgICAgICAgICAg ICAgICAgICAgb3B0LCB2YWwgPSBvcHRfdmFsCkBAIC0xMTc3LDYgKzExNzMsNyBAQCBjbGFz cyBYZW5kQ29uZmlnKGRpY3QpOgogICAgICAgICAgICAgICAgIGlmIGRldl91dWlkIG5vdCBp biB0YXJnZXRbJ2NvbnNvbGVfcmVmcyddOgogICAgICAgICAgICAgICAgICAgICB0YXJnZXRb J2NvbnNvbGVfcmVmcyddLmFwcGVuZChkZXZfdXVpZCkKICAgICAgICAgICAgICAgICAgICAg CisgICAgICAgICAgICBsb2cuZGVidWcoIlhlbmRDb25maWc6IHJlYWRpbmcgZGV2aWNlOiAl cyIgJSBzY3J1Yl9wYXNzd29yZChkZXZfaW5mbykpCiAgICAgICAgICAgICByZXR1cm4gZGV2 X3V1aWQKIAogICAgICAgICBpZiBjZmdfeGVuYXBpOgpkaWZmIC1yIDk2NmE2ZDNiNzQwOCAt ciBhNzBmZmM0ODlhZTIgdG9vbHMvcHl0aG9uL3hlbi94ZW5kL3NlcnZlci9wY2lpZi5weQot LS0gYS90b29scy9weXRob24veGVuL3hlbmQvc2VydmVyL3BjaWlmLnB5CUZyaSBEZWMgMTQg MTE6NTA6MjQgMjAwNyArMDAwMAorKysgYi90b29scy9weXRob24veGVuL3hlbmQvc2VydmVy L3BjaWlmLnB5CU1vbiBEZWMgMTcgMTQ6NTM6MzUgMjAwNyArMDkwMApAQCAtMTAyLDEzICsx MDIsMTMgQEAgY2xhc3MgUGNpQ29udHJvbGxlcihEZXZDb250cm9sbGVyKToKICAgICAgICAg cmVzdWx0Wyd1dWlkJ10gPSBzZWxmLnJlYWRCYWNrZW5kKGRldmlkLCAndXVpZCcpCiAgICAg ICAgIHJldHVybiByZXN1bHQKIAotICAgIGRlZiBjb25maWd1cmF0aW9uKHNlbGYsIGRldmlk KToKKyAgICBkZWYgY29uZmlndXJhdGlvbihzZWxmLCBkZXZpZCwgdHJhbnNhY3Rpb24gPSBO b25lKToKICAgICAgICAgIiIiUmV0dXJucyBTWFBSIGZvciBkZXZpY2VzIG9uIGRvbWFpbi4K IAogICAgICAgICBAbm90ZTogd2UgdHJlYXQgdGhpcyBkaWN0IGVzcGVjaWFsbHkgdG8gY29u dmVydCB0bwogICAgICAgICBTWFAgYmVjYXVzZSBpdCBpcyBub3QgYSBzdHJhaWdodCBkaWN0 IG9mIHN0cmluZ3MuIiIiCiAgICAgICAgIAotICAgICAgICBjb25maWdEaWN0ID0gc2VsZi5n ZXREZXZpY2VDb25maWd1cmF0aW9uKGRldmlkKQorICAgICAgICBjb25maWdEaWN0ID0gc2Vs Zi5nZXREZXZpY2VDb25maWd1cmF0aW9uKGRldmlkLCB0cmFuc2FjdGlvbikKICAgICAgICAg c3hwciA9IFtzZWxmLmRldmljZUNsYXNzXQogCiAgICAgICAgICMgcmVtb3ZlIGRldnMK --------------080304060404050604030501 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 --------------080304060404050604030501--