On Fri, 10 Jun 2011, Marek Marczykowski wrote:
> # HG changeset patch
> # User Marek Marczykowski <marmarek@xxxxxxxxxxxx>
> # 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 <marmarek@xxxxxxxxxxxx>
>
> 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
> rc = libxl_device_pci_list_assigned(ctx, &pcidevs, domid, &num);
> if ( rc )
> return rc;
> + if ( num == 0 )
> + return 0;
> for (i = 0; i < num; i++) {
> /* Force remove on shutdown since, on HVM, qemu will not always
> * respond to SCI interrupt because the guest kernel has shut down
> the
Is the problem here that num is 0 and pcidevs is uninitialized?
If so, would this patch solve the problem you are seeing?
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 = strtok_r(NULL, ",=", &saveptr)) != NULL);
}
}
- if ( *num )
- *list = pcidevs;
+ *list = pcidevs;
libxl__free_all(&gc);
return 0;
}
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|