forked from pool/libvirt
0e53c763a0
- CVE-2014-0028, CVE-2014-1447, CVE-2013-6458, CVE-2013-6457,
CVE-2013-6436
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Dropped upstream patches: 5e397d9c-test-fix-dbus-crash.patch,
78af457e-fix-virnettlscontexttest.patch,
9faf3f29-LXC-memtune.patch, f8c1cb90-CVE-2013-6436.patch,
libxl-hvm-nic.patch
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=342
43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
Fix PCI device attach in xend driver
|
|
|
|
When attaching PCI device using the xend driver, the 'device_create'
|
|
RPC is called, which is not sufficient to fully prepare/configure
|
|
the device for attachment to a domain. In the xen tools, xm pci-attach
|
|
uses the 'device_configure' RPC.
|
|
|
|
This patch changes the xend driver to always call 'device_configure' for
|
|
PCI devices to be consistent with the usage in the xen tools.
|
|
|
|
Index: libvirt-1.2.1/src/xen/xend_internal.c
|
|
===================================================================
|
|
--- libvirt-1.2.1.orig/src/xen/xend_internal.c
|
|
+++ libvirt-1.2.1/src/xen/xend_internal.c
|
|
@@ -2216,6 +2216,7 @@ xenDaemonAttachDeviceFlags(virConnectPtr
|
|
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
|
char class[8], ref[80];
|
|
char *target = NULL;
|
|
+ int new_dev;
|
|
|
|
virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1);
|
|
|
|
@@ -2314,8 +2315,18 @@ xenDaemonAttachDeviceFlags(virConnectPtr
|
|
}
|
|
|
|
sexpr = virBufferContentAndReset(&buf);
|
|
+ new_dev = virDomainXMLDevID(conn, minidef, dev, class, ref, sizeof(ref));
|
|
|
|
- if (virDomainXMLDevID(conn, minidef, dev, class, ref, sizeof(ref))) {
|
|
+ /* always call 'device_configure' for pci device */
|
|
+ if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV &&
|
|
+ dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
|
|
+ dev->data.hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
|
|
+ ret = xend_op(conn, def->name, "op", "device_configure",
|
|
+ "config", sexpr, "dev", ref, NULL);
|
|
+ goto cleanup;
|
|
+ }
|
|
+
|
|
+ if (new_dev) {
|
|
/* device doesn't exist, define it */
|
|
ret = xend_op(conn, def->name, "op", "device_create",
|
|
"config", sexpr, NULL);
|