From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marek Marczykowski Subject: Re: [PATCH] libxl: do not try to detach pci device when none attached Date: Fri, 10 Jun 2011 12:48:21 +0200 Message-ID: <4DF1F675.4000700@mimuw.edu.pl> References: <88f67b423c89f4bd6048.1307662408@devel14> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0028808465==" Return-path: In-Reply-To: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Stefano Stabellini Cc: "xen-devel@lists.xensource.com" List-Id: xen-devel@lists.xenproject.org This is a cryptographically signed message in MIME format. --===============0028808465== Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms070204000605090604070208" This is a cryptographically signed message in MIME format. --------------ms070204000605090604070208 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 10.06.2011 12:44, Stefano Stabellini wrote: > On Fri, 10 Jun 2011, Marek Marczykowski wrote: >> # HG changeset patch >> # User Marek Marczykowski >> # Date 1307662302 -7200 >> # Node ID 88f67b423c89f4bd604837b9eae2483dad5ebb0d >> # Parent 4b392511ae0840fba66c40aa2788dc1ff402b6e8 >> libxl: do not try to detach pci device when none attached >> >> Fixes SEGV on domain destroy >> >> Signed-off-by: Marek Marczykowski >> >> diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c >> --- a/tools/libxl/libxl_pci.c >> +++ b/tools/libxl/libxl_pci.c >> @@ -1039,6 +1039,8 @@ int libxl_device_pci_shutdown(libxl_ctx=20 >> rc =3D libxl_device_pci_list_assigned(ctx, &pcidevs, domid, &num)= ; >> if ( rc ) >> return rc; >> + if ( num =3D=3D 0 ) >> + return 0; >> for (i =3D 0; i < num; i++) { >> /* Force remove on shutdown since, on HVM, qemu will not alwa= ys >> * respond to SCI interrupt because the guest kernel has shut= down the >=20 > Is the problem here that num is 0 and pcidevs is uninitialized? > If so, would this patch solve the problem you are seeing? No, when there is no PCI devs, libxl_device_pci_list_assigned exists earlier - before allocating memory for pcidevs. > diff -r 37c77bacb52a tools/libxl/libxl_pci.c > --- a/tools/libxl/libxl_pci.c Mon May 23 17:38:28 2011 +0100 > +++ b/tools/libxl/libxl_pci.c Fri Jun 10 10:39:05 2011 +0000 > @@ -1022,8 +1022,7 @@ int libxl_device_pci_list_assigned(libxl > } while ((p =3D strtok_r(NULL, ",=3D", &saveptr)) !=3D NUL= L); > } > } > - if ( *num ) > - *list =3D pcidevs; > + *list =3D pcidevs; > libxl__free_all(&gc); > return 0; > } --=20 Pozdrawiam / Best Regards, Marek Marczykowski | RLU #390519 marmarek at mimuw edu pl | xmpp:marmarek at staszic waw pl --------------ms070204000605090604070208 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIRqDCC BVcwggQ/oAMCAQICEGdLwnOg7SU/xzieX7FaFewwDQYJKoZIhvcNAQEFBQAwgd0xCzAJBgNV BAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1 c3QgTmV0d29yazE7MDkGA1UECxMyVGVybXMgb2YgdXNlIGF0IGh0dHBzOi8vd3d3LnZlcmlz aWduLmNvbS9ycGEgKGMpMDkxHjAcBgNVBAsTFVBlcnNvbmEgTm90IFZhbGlkYXRlZDE3MDUG A1UEAxMuVmVyaVNpZ24gQ2xhc3MgMSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0EgLSBHMzAe Fw0xMDEyMDgwMDAwMDBaFw0xMTEyMDgyMzU5NTlaMIIBGjEXMBUGA1UEChMOVmVyaVNpZ24s IEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxRjBEBgNVBAsTPXd3dy52 ZXJpc2lnbi5jb20vcmVwb3NpdG9yeS9SUEEgSW5jb3JwLiBieSBSZWYuLExJQUIuTFREKGMp OTgxHjAcBgNVBAsTFVBlcnNvbmEgTm90IFZhbGlkYXRlZDEzMDEGA1UECxMqRGlnaXRhbCBJ RCBDbGFzcyAxIC0gTmV0c2NhcGUgRnVsbCBTZXJ2aWNlMRswGQYDVQQDFBJNQVJFSyBNYXJj enlrb3dza2kxJDAiBgkqhkiG9w0BCQEWFW1hcm1hcmVrQG1pbXV3LmVkdS5wbDCCASIwDQYJ KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMGGGDj1KJXXy13nNqo0NP7EJNnzjWHih+Z88UA/ c/CZOIu3/SUnA9gly922moQ+r4AM0k6EQaVkAdldSOy1hO/fTcJQBwDemcnACWstMDMvIbWn dkxyxNgh8bQD/xKXx1SyfKTixcx0QZXosY8HnHLWeF0Te5U9J8yUPxigCFJFe6rtY2iARrWc qWXDr4DRQc5J43aohBXGRHw+OakREqLZds6HEE6+YvJH+udcfqlrfkLKHJeiyA4UPtZwBvam EGOKrm2rqyps/JeivaTs6zKh0+4eNxSKlOGTUmj4eHVb/K3gkbX6bihmWS+9nnN3I4HL+KPZ j88xQCHX07Gh4nECAwEAAaOB0jCBzzAJBgNVHRMEAjAAMEQGA1UdIAQ9MDswOQYLYIZIAYb4 RQEHFwEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYTALBgNV HQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwQGCCsGAQUFBwMCMFAGA1UdHwRJMEcwRaBD oEGGP2h0dHA6Ly9pbmRjMWRpZ2l0YWxpZC1nMy1jcmwudmVyaXNpZ24uY29tL0luZEMxRGln aXRhbElELUczLmNybDANBgkqhkiG9w0BAQUFAAOCAQEAl7oehxokYa9omPurM44GROaRxtIQ acWWpCgeMNDqJXyEgm30u0hY1szXiSyVnkIx/sh4HuBqvXJnZZvLjksEIzdALTgCAskojzeT oeX+340loS87OO82/XUDT5YY3+R5G+4oQIxKVqF7kDmOuJ2opbjU4dFxHhIypiEcWjG2sjWd 127poxMQeY4lCk3qKw94pK5RpVPJK8hzaf+pWoL2D7i3L2xE+DMzZJ1OB3AxcGxhvupUq+zz 3Z9IIHo6DNOwUyCNR+ShVnuCaoJcya35mQzhs1s5+LcP/ysrUzhPo+iYNXGv+q5iNQEXZ7Dw kPgAm17fnxmih6D4KRbmrc3xpjCCBVcwggQ/oAMCAQICEGdLwnOg7SU/xzieX7FaFewwDQYJ KoZIhvcNAQEFBQAwgd0xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEf MB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazE7MDkGA1UECxMyVGVybXMgb2YgdXNl IGF0IGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEgKGMpMDkxHjAcBgNVBAsTFVBlcnNv bmEgTm90IFZhbGlkYXRlZDE3MDUGA1UEAxMuVmVyaVNpZ24gQ2xhc3MgMSBJbmRpdmlkdWFs IFN1YnNjcmliZXIgQ0EgLSBHMzAeFw0xMDEyMDgwMDAwMDBaFw0xMTEyMDgyMzU5NTlaMIIB GjEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5l dHdvcmsxRjBEBgNVBAsTPXd3dy52ZXJpc2lnbi5jb20vcmVwb3NpdG9yeS9SUEEgSW5jb3Jw LiBieSBSZWYuLExJQUIuTFREKGMpOTgxHjAcBgNVBAsTFVBlcnNvbmEgTm90IFZhbGlkYXRl ZDEzMDEGA1UECxMqRGlnaXRhbCBJRCBDbGFzcyAxIC0gTmV0c2NhcGUgRnVsbCBTZXJ2aWNl MRswGQYDVQQDFBJNQVJFSyBNYXJjenlrb3dza2kxJDAiBgkqhkiG9w0BCQEWFW1hcm1hcmVr QG1pbXV3LmVkdS5wbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMGGGDj1KJXX y13nNqo0NP7EJNnzjWHih+Z88UA/c/CZOIu3/SUnA9gly922moQ+r4AM0k6EQaVkAdldSOy1 hO/fTcJQBwDemcnACWstMDMvIbWndkxyxNgh8bQD/xKXx1SyfKTixcx0QZXosY8HnHLWeF0T e5U9J8yUPxigCFJFe6rtY2iARrWcqWXDr4DRQc5J43aohBXGRHw+OakREqLZds6HEE6+YvJH +udcfqlrfkLKHJeiyA4UPtZwBvamEGOKrm2rqyps/JeivaTs6zKh0+4eNxSKlOGTUmj4eHVb /K3gkbX6bihmWS+9nnN3I4HL+KPZj88xQCHX07Gh4nECAwEAAaOB0jCBzzAJBgNVHRMEAjAA MEQGA1UdIAQ9MDswOQYLYIZIAYb4RQEHFwEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cu dmVyaXNpZ24uY29tL3JwYTALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwQGCCsG AQUFBwMCMFAGA1UdHwRJMEcwRaBDoEGGP2h0dHA6Ly9pbmRjMWRpZ2l0YWxpZC1nMy1jcmwu dmVyaXNpZ24uY29tL0luZEMxRGlnaXRhbElELUczLmNybDANBgkqhkiG9w0BAQUFAAOCAQEA l7oehxokYa9omPurM44GROaRxtIQacWWpCgeMNDqJXyEgm30u0hY1szXiSyVnkIx/sh4HuBq vXJnZZvLjksEIzdALTgCAskojzeToeX+340loS87OO82/XUDT5YY3+R5G+4oQIxKVqF7kDmO uJ2opbjU4dFxHhIypiEcWjG2sjWd127poxMQeY4lCk3qKw94pK5RpVPJK8hzaf+pWoL2D7i3 L2xE+DMzZJ1OB3AxcGxhvupUq+zz3Z9IIHo6DNOwUyCNR+ShVnuCaoJcya35mQzhs1s5+LcP /ysrUzhPo+iYNXGv+q5iNQEXZ7DwkPgAm17fnxmih6D4KRbmrc3xpjCCBu4wggXWoAMCAQIC EHEVZgVK5JEhTem8RPms09wwDQYJKoZIhvcNAQEFBQAwgcoxCzAJBgNVBAYTAlVTMRcwFQYD VQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazE6 MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ug b25seTFFMEMGA1UEAxM8VmVyaVNpZ24gQ2xhc3MgMSBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZp Y2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA5MDUwMTAwMDAwMFoXDTE5MDQzMDIzNTk1OVow gd0xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVy aVNpZ24gVHJ1c3QgTmV0d29yazE7MDkGA1UECxMyVGVybXMgb2YgdXNlIGF0IGh0dHBzOi8v d3d3LnZlcmlzaWduLmNvbS9ycGEgKGMpMDkxHjAcBgNVBAsTFVBlcnNvbmEgTm90IFZhbGlk YXRlZDE3MDUGA1UEAxMuVmVyaVNpZ24gQ2xhc3MgMSBJbmRpdmlkdWFsIFN1YnNjcmliZXIg Q0EgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO3ER98qKB18Bmu71yEy yWwTj+mxjUFONPfaC+Nq+mWIIAsRE+mb4ElOi2/VAdBfDUeRilpMdD4/xpEJu0w0no1uoYJR YvdpdliWB6+eFBgHT1q9n9IxslQZc0ZqGUIR7BJzIY313DDN5dlWCjHFNm0pFJe9LdqJRxmI 2EsEPeu2PGcedAATDdCG2pNn+DMDrho8a2l49sAsjuGDP3f5mf/+n1JawrSHCthsqUfBVCll Qz5KwJYfwa33d69ssQRevsG2lC2XkC0n0rse6YNqhPbEsq4jBmUmpSdYKwcitG+mYkgad/LV UCeaKdOW+yj1uiR2YuOMWev7btVCxL5Bx/UCAwEAAaOCArkwggK1MDQGCCsGAQUFBwEBBCgw JjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AudmVyaXNpZ24uY29tMBIGA1UdEwEB/wQIMAYB Af8CAQAwcAYDVR0gBGkwZzBlBgtghkgBhvhFAQcXATBWMCgGCCsGAQUFBwIBFhxodHRwczov L3d3dy52ZXJpc2lnbi5jb20vY3BzMCoGCCsGAQUFBwICMB4aHGh0dHBzOi8vd3d3LnZlcmlz aWduLmNvbS9ycGEwNAYDVR0fBC0wKzApoCegJYYjaHR0cDovL2NybC52ZXJpc2lnbi5jb20v cGNhMS1nMy5jcmwwDgYDVR0PAQH/BAQDAgEGMG4GCCsGAQUFBwEMBGIwYKFeoFwwWjBYMFYW CWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFEtruSiWBgy70FI4mymsSweLIQUYMCYWJGh0dHA6 Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28xLmdpZjAuBgNVHREEJzAlpCMwITEfMB0GA1UE AxMWUHJpdmF0ZUxhYmVsNC0yMDQ4LTExODAdBgNVHQ4EFgQUeUdhCEH9OASiS+e1zPVD9kkr EfgwgfEGA1UdIwSB6TCB5qGB0KSBzTCByjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlT aWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEo YykgMTk5OSBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYD VQQDEzxWZXJpU2lnbiBDbGFzcyAxIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0 aG9yaXR5IC0gRzOCEQCLW3VWhFSFCwDPrzhIzrGkMA0GCSqGSIb3DQEBBQUAA4IBAQA5Tc9B mYG1qQW1UjjpOYSJbOQ0qFrn2GwJTCQaulmkhztzIfGTgc+/aGNaZ/41hSuhw12jSsI6Gd0w 1sxN7/HSgZfKVFpDvzeLeo4ZjQ9DqIzyr2CzFYqzlZw84J6zJ5ikNXIX5fwqXYfTig3C0UUq +MD0rCqTOtWuEnAI6/s74nfs6CtkNXbNutrg0csU1nFYm77VPn222egkxSRmTF2RH3azFz5/ DcYhiS+zN7ih/1yybUneZVJC+w6I0u1KHb9L4/jMcvpIDmWOScjW+JmYO7eUPjFxBof6bFlT LtffK+1fYwCsFe0DuFUWjMZoA+ciqHMLsbyg2lJY3QoOf8GCMYIE7DCCBOgCAQEwgfIwgd0x CzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNp Z24gVHJ1c3QgTmV0d29yazE7MDkGA1UECxMyVGVybXMgb2YgdXNlIGF0IGh0dHBzOi8vd3d3 LnZlcmlzaWduLmNvbS9ycGEgKGMpMDkxHjAcBgNVBAsTFVBlcnNvbmEgTm90IFZhbGlkYXRl ZDE3MDUGA1UEAxMuVmVyaVNpZ24gQ2xhc3MgMSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0Eg LSBHMwIQZ0vCc6DtJT/HOJ5fsVoV7DAJBgUrDgMCGgUAoIICzjAYBgkqhkiG9w0BCQMxCwYJ KoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0xMTA2MTAxMDQ4MjFaMCMGCSqGSIb3DQEJBDEW BBRtXlwydaCWG1tuqnu5iPkXD3m1IzBfBgkqhkiG9w0BCQ8xUjBQMAsGCWCGSAFlAwQBAjAK BggqhkiG9w0DBzAOBggqhkiG9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYI KoZIhvcNAwICASgwggEDBgkrBgEEAYI3EAQxgfUwgfIwgd0xCzAJBgNVBAYTAlVTMRcwFQYD VQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazE7 MDkGA1UECxMyVGVybXMgb2YgdXNlIGF0IGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEg KGMpMDkxHjAcBgNVBAsTFVBlcnNvbmEgTm90IFZhbGlkYXRlZDE3MDUGA1UEAxMuVmVyaVNp Z24gQ2xhc3MgMSBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0EgLSBHMwIQZ0vCc6DtJT/HOJ5f sVoV7DCCAQUGCyqGSIb3DQEJEAILMYH1oIHyMIHdMQswCQYDVQQGEwJVUzEXMBUGA1UEChMO VmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxOzA5BgNV BAsTMlRlcm1zIG9mIHVzZSBhdCBodHRwczovL3d3dy52ZXJpc2lnbi5jb20vcnBhIChjKTA5 MR4wHAYDVQQLExVQZXJzb25hIE5vdCBWYWxpZGF0ZWQxNzA1BgNVBAMTLlZlcmlTaWduIENs YXNzIDEgSW5kaXZpZHVhbCBTdWJzY3JpYmVyIENBIC0gRzMCEGdLwnOg7SU/xzieX7FaFeww DQYJKoZIhvcNAQEBBQAEggEAuFCA6loprQM7jyekc/m7QxLcweedEP3MTzdQCpbMorqlg3qA agNVAKnErbHbSLGpyamUKu6FaSNGGtzf4jZ8tKLhH7yn3XQXSDLpy3uzFzPahKDcYTOkgPvA kU7t1b3boCkqBBfYDmj/RcWTmBHG9tmr+407gQLshgq0IDj6W3yBZ3fEndFxtbqPHia/QGP+ RIOtA6tRZXIlHKStgl6MUbR4f4qiHxsTDWZPIyX+F8abccFkLuIY/DinwgqBh0bdpv7NZsKh 1uRweKKD5+mTTtZLzyjioB87RWq0JxBXMugN7UWQ7jM6Q5UN9CCpnOJbJB6EDEda69FewRvi djggBgAAAAAAAA== --------------ms070204000605090604070208-- --===============0028808465== 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 --===============0028808465==--