CVE-2017-1000256: libvirt: TLS certificate verification disabled for clients (bz #1503687 )

Fix TPM2 passthrough (bz #1486240 )
Fix spice GL qemu:///system rendernode permissions (bz #1460804) Fix on_reboot=destroy setting (bz #1476866) Fix disk images in /dev/shm (bz #1482146)
2017-12-04 12:16:49 -05:00 · 2017-09-15 19:04:20 -04:00 · 2017-08-04 16:11:19 -04:00 · 2017-07-12 16:26:46 -04:00 · 2017-06-14 10:47:37 -04:00 · 2017-05-31 17:28:27 -04:00
43 changed files with 4915 additions and 3651 deletions
@@ -1,14 +0,0 @@
-.build*.log
-*.rpm
-i686
-x86_64
-libvirt-*.tar.gz
-libvirt-0.6.0.tar.gz
-libvirt-0.6.1.tar.gz
-libvirt-0.6.2.tar.gz
-libvirt-0.6.3.tar.gz
-libvirt-0.6.4.tar.gz
-libvirt-0.6.5.tar.gz
-libvirt-0.7.0-0.1.gitf055724.tar.gz
-libvirt-0.7.0-0.6.gite195b43.tar.gz
-libvirt-0.7.0.tar.gz
@@ -0,0 +1,5 @@
+.build*.log
+*.rpm
+i686
+x86_64
+libvirt-*.tar.xz
@@ -0,0 +1,122 @@
+From: Andrea Bolognani <abologna@redhat.com>
+Date: Fri, 12 May 2017 14:05:55 +0200
+Subject: [PATCH] tests: Check default GIC version for aarch64/virt TCG guests
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+(cherry picked from commit b24eaf6210ebaf5dc8d29621063873c8419c517e)
+---
+ .../qemuxml2argv-aarch64-gic-none-tcg.args         | 19 ++++++++++++++++
+ .../qemuxml2argv-aarch64-gic-none-tcg.xml          | 17 +++++++++++++++
+ tests/qemuxml2argvtest.c                           |  3 +++
+ .../qemuxml2xmlout-aarch64-gic-none-tcg.xml        | 25 ++++++++++++++++++++++
+ tests/qemuxml2xmltest.c                            |  1 +
+ 5 files changed, 65 insertions(+)
+ create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.args
+ create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.xml
+ create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-tcg.xml
+
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.args
+new file mode 100644
+index 000000000..975a01481
+--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.args
+@@ -0,0 +1,19 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/home/test \
+USER=test \
+LOGNAME=test \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-aarch64 \
+-name guest \
+-S \
+-machine virt,accel=tcg,gic-version=3 \
+-cpu cortex-a57 \
+-m 1024 \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
+-nographic \
+-nodefaults \
+-monitor unix:/tmp/lib/domain--1-guest/monitor.sock,server,nowait \
+-no-acpi \
+-boot c
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.xml
+new file mode 100644
+index 000000000..0aa33dbec
+--- /dev/null
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.xml
+@@ -0,0 +1,17 @@
+<domain type='qemu'>
+  <name>guest</name>
+  <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
+  <memory unit='KiB'>1048576</memory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='aarch64' machine='virt'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='custom'>
+    <model>cortex-a57</model>
+  </cpu>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <memballoon model='none'/>
+  </devices>
+</domain>
+diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
+index cc4fb91cd..362b140ac 100644
+--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
+@@ -2250,6 +2250,9 @@ mymain(void)
+     DO_TEST_GIC("aarch64-gic-none-both", GIC_BOTH,
+             QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT,
+             QEMU_CAPS_MACH_VIRT_GIC_VERSION);
+    DO_TEST_GIC("aarch64-gic-none-tcg", GIC_BOTH,
+            QEMU_CAPS_MACHINE_OPT,
+            QEMU_CAPS_MACH_VIRT_GIC_VERSION);
+     DO_TEST_GIC("aarch64-gic-default", GIC_NONE,
+             QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT);
+     DO_TEST_GIC("aarch64-gic-default", GIC_NONE,
+diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-tcg.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-tcg.xml
+new file mode 100644
+index 000000000..69510e281
+--- /dev/null
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-tcg.xml
+@@ -0,0 +1,25 @@
+<domain type='qemu'>
+  <name>guest</name>
+  <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
+  <memory unit='KiB'>1048576</memory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='aarch64' machine='virt'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <features>
+    <gic version='3'/>
+  </features>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='allow'>cortex-a57</model>
+  </cpu>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
+    <memballoon model='none'/>
+  </devices>
+</domain>
+diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
+index eae999dd6..aae632afe 100644
+--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
+@@ -1073,6 +1073,7 @@ mymain(void)
+     DO_TEST_FULL("aarch64-gic-none-v2", WHEN_BOTH, GIC_V2, NONE);
+     DO_TEST_FULL("aarch64-gic-none-v3", WHEN_BOTH, GIC_V3, NONE);
+     DO_TEST_FULL("aarch64-gic-none-both", WHEN_BOTH, GIC_BOTH, NONE);
+    DO_TEST_FULL("aarch64-gic-none-tcg", WHEN_BOTH, GIC_BOTH, NONE);
+     DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_NONE, NONE);
+     DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_V2, NONE);
+     DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_V3, NONE);
@@ -0,0 +1,85 @@
+From: Andrea Bolognani <abologna@redhat.com>
+Date: Fri, 12 May 2017 13:29:57 +0200
+Subject: [PATCH] qemu: Use GICv2 for aarch64/virt TCG guests
+
+There are currently some limitations in the emulated GICv3
+that make it unsuitable as a default. Use GICv2 instead.
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1450433
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+(cherry picked from commit bc07101a7c2cd2ce07ad1ca28c47e0a7cde5625d)
+---
+ src/qemu/qemu_domain.c                             | 23 +++++++++++++++++++++-
+ .../qemuxml2argv-aarch64-gic-none-tcg.args         |  2 +-
+ .../qemuxml2xmlout-aarch64-gic-none-tcg.xml        |  2 +-
+ 3 files changed, 24 insertions(+), 3 deletions(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 589eb1889..891f8258a 100644
+--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
+@@ -2527,6 +2527,24 @@ qemuDomainDefEnableDefaultFeatures(virDomainDefPtr def,
+         for (version = VIR_GIC_VERSION_LAST - 1;
+              version > VIR_GIC_VERSION_NONE;
+              version--) {
+
+            /* We want to use the highest available GIC version for guests;
+             * however, the emulated GICv3 is currently lacking a MSI controller,
+             * making it unsuitable for the pure PCIe topology we aim for.
+             *
+             * For that reason, we skip this step entirely for TCG guests,
+             * and rely on the code below to pick the default version, GICv2,
+             * which supports all the features we need.
+             *
+             * We'll want to revisit this once MSI support for GICv3 has been
+             * implemented in QEMU.
+             *
+             * See https://bugzilla.redhat.com/show_bug.cgi?id=1414081 */
+            if (version == VIR_GIC_VERSION_3 &&
+                def->virtType == VIR_DOMAIN_VIRT_QEMU) {
+                continue;
+            }
+
+             if (virQEMUCapsSupportsGICVersion(qemuCaps,
+                                               def->virtType,
+                                               version)) {
+@@ -2544,8 +2562,11 @@ qemuDomainDefEnableDefaultFeatures(virDomainDefPtr def,
+ 
+     /* Use the default GIC version if no version was specified */
+     if (def->features[VIR_DOMAIN_FEATURE_GIC] == VIR_TRISTATE_SWITCH_ON &&
+-        def->gic_version == VIR_GIC_VERSION_NONE)
+        def->gic_version == VIR_GIC_VERSION_NONE) {
+        VIR_DEBUG("Using GIC version %s (default)",
+                  virGICVersionTypeToString(VIR_GIC_VERSION_DEFAULT));
+         def->gic_version = VIR_GIC_VERSION_DEFAULT;
+    }
+ }
+ 
+ 
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.args
+index 975a01481..52b699696 100644
+--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.args
+@@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \
+ /usr/bin/qemu-system-aarch64 \
+ -name guest \
+ -S \
+--machine virt,accel=tcg,gic-version=3 \
+-machine virt,accel=tcg \
+ -cpu cortex-a57 \
+ -m 1024 \
+ -smp 1,sockets=1,cores=1,threads=1 \
+diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-tcg.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-tcg.xml
+index 69510e281..a0cd0b768 100644
+--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-tcg.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-tcg.xml
+@@ -9,7 +9,7 @@
+     <boot dev='hd'/>
+   </os>
+   <features>
+-    <gic version='3'/>
+    <gic version='2'/>
+   </features>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='allow'>cortex-a57</model>
@@ -0,0 +1,67 @@
+From: Andrea Bolognani <abologna@redhat.com>
+Date: Fri, 12 May 2017 14:38:08 +0200
+Subject: [PATCH] gic: Remove VIR_GIC_VERSION_DEFAULT
+
+The QEMU default is GICv2, and some of the code in libvirt
+relies on the exact value. Stop pretending that's not the
+case and use GICv2 explicitly where needed.
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+(cherry picked from commit 5645badd1fe04fee7237c2f95e7710e978e40770)
+---
+ src/qemu/qemu_command.c | 6 +++---
+ src/qemu/qemu_domain.c  | 7 +++----
+ src/util/virgic.h       | 3 ---
+ 3 files changed, 6 insertions(+), 10 deletions(-)
+
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index 2d1328cf9..5feddc523 100644
+--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
+@@ -7321,9 +7321,9 @@ qemuBuildMachineCommandLine(virCommandPtr cmd,
+                     goto cleanup;
+                 }
+ 
+-                /* The default GIC version should not be specified on the
+-                 * QEMU commandline for backwards compatibility reasons */
+-                if (def->gic_version != VIR_GIC_VERSION_DEFAULT) {
+                /* The default GIC version (GICv2) should not be specified on
+                 * the QEMU commandline for backwards compatibility reasons */
+                if (def->gic_version != VIR_GIC_VERSION_2) {
+                     if (!virQEMUCapsGet(qemuCaps,
+                                         QEMU_CAPS_MACH_VIRT_GIC_VERSION)) {
+                         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 891f8258a..4a127cedf 100644
+--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
+@@ -2560,12 +2560,11 @@ qemuDomainDefEnableDefaultFeatures(virDomainDefPtr def,
+         def->features[VIR_DOMAIN_FEATURE_GIC] = VIR_TRISTATE_SWITCH_ON;
+     }
+ 
+-    /* Use the default GIC version if no version was specified */
+    /* Use the default GIC version (GICv2) if no version was specified */
+     if (def->features[VIR_DOMAIN_FEATURE_GIC] == VIR_TRISTATE_SWITCH_ON &&
+         def->gic_version == VIR_GIC_VERSION_NONE) {
+-        VIR_DEBUG("Using GIC version %s (default)",
+-                  virGICVersionTypeToString(VIR_GIC_VERSION_DEFAULT));
+-        def->gic_version = VIR_GIC_VERSION_DEFAULT;
+        VIR_DEBUG("Using GIC version 2 (default)");
+        def->gic_version = VIR_GIC_VERSION_2;
+     }
+ }
+ 
+diff --git a/src/util/virgic.h b/src/util/virgic.h
+index 1c9efd60f..2d77fdd45 100644
+--- a/src/util/virgic.h
+++ b/src/util/virgic.h
+@@ -35,9 +35,6 @@ typedef enum {
+ 
+ VIR_ENUM_DECL(virGICVersion);
+ 
+-/* Consider GIC v2 the default */
+-# define VIR_GIC_VERSION_DEFAULT VIR_GIC_VERSION_2
+-
+ typedef enum {
+     VIR_GIC_IMPLEMENTATION_NONE = 0,
+     VIR_GIC_IMPLEMENTATION_KERNEL = (1 << 1),
@@ -0,0 +1,198 @@
+From: Laine Stump <laine@laine.org>
+Date: Thu, 18 May 2017 14:16:27 -0400
+Subject: [PATCH] Revert "qemu: propagate bridge MTU into qemu "host_mtu"
+ option"
+
+This reverts commit 2841e675.
+
+It turns out that adding the host_mtu field to the PCI capabilities in
+the guest bumps the length of PCI capabilities beyond the 32 byte
+boundary, so the virtio-net device gets 64 bytes of ioport space
+instead of 32, which offsets the address of all the other following
+devices. Migration doesn't work very well when the location and length
+of PCI capabilities of devices is changed between source and
+destination.
+
+This means that we need to make sure that the absence/presence of
+host_mtu on the qemu commandline always matches between source and
+destination, which means that we need to make setting of host_mtu an
+opt-in thing (it can't happen automatically when the bridge being used
+has a non-default MTU, which is what commit 2841e675 implemented).
+
+I do want to re-implement this feature with an <mtu auto='on'/>
+setting, but probably won't backport that to any stable branches, so
+I'm first reverting the original commit, and that revert can be pushed
+to the few releases that have been made since the original (3.1.0 -
+3.3.0)
+
+Resolves: https://bugzilla.redhat.com/1449346
+(cherry picked from commit 77780a29edace958a1f931d3281b962be4f5290e)
+(cherry picked from commit a2f5e87dceb1725c16cd4df17a4b7381ecf65901)
+---
+ src/qemu/qemu_command.c   | 32 ++++++++++----------------------
+ src/qemu/qemu_command.h   |  3 +--
+ src/qemu/qemu_hotplug.c   |  5 ++---
+ src/qemu/qemu_interface.c |  5 ++---
+ src/qemu/qemu_interface.h |  3 +--
+ 5 files changed, 16 insertions(+), 32 deletions(-)
+
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index 5feddc523..3abfe7b55 100644
+--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
+@@ -3629,8 +3629,7 @@ qemuBuildNicDevStr(virDomainDefPtr def,
+                    int vlan,
+                    unsigned int bootindex,
+                    size_t vhostfdSize,
+-                   virQEMUCapsPtr qemuCaps,
+-                   unsigned int mtu)
+                   virQEMUCapsPtr qemuCaps)
+ {
+     virBuffer buf = VIR_BUFFER_INITIALIZER;
+     const char *nic = net->model;
+@@ -3754,23 +3753,13 @@ qemuBuildNicDevStr(virDomainDefPtr def,
+         virBufferAsprintf(&buf, ",rx_queue_size=%u", net->driver.virtio.rx_queue_size);
+     }
+ 
+-    if (usingVirtio && mtu) {
+-        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_HOST_MTU)) {
+-
+-            virBufferAsprintf(&buf, ",host_mtu=%u", mtu);
+-
+-        } else {
+-            /* log an error if mtu was requested specifically for this
+-             * interface, otherwise, if it's just what was reported by
+-             * the attached network, ignore it.
+-             */
+-            if (net->mtu) {
+-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+-                               _("setting MTU is not supported with "
+-                                 "this QEMU binary"));
+-                goto error;
+-            }
+    if (usingVirtio && net->mtu) {
+        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_HOST_MTU)) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("setting MTU is not supported with this QEMU binary"));
+            goto error;
+         }
+        virBufferAsprintf(&buf, ",host_mtu=%u", net->mtu);
+     }
+ 
+     if (vlan == -1)
+@@ -8213,7 +8202,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver,
+     VIR_FREE(netdev);
+ 
+     if (!(nic = qemuBuildNicDevStr(def, net, -1, bootindex,
+-                                   queues, qemuCaps, net->mtu))) {
+                                   queues, qemuCaps))) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+                        "%s", _("Error generating NIC -device string"));
+         goto error;
+@@ -8259,7 +8248,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
+     virDomainNetType actualType = virDomainNetGetActualType(net);
+     virNetDevBandwidthPtr actualBandwidth;
+     size_t i;
+-    unsigned int mtu = net->mtu;
+ 
+ 
+     if (!bootindex)
+@@ -8314,7 +8302,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
+         memset(tapfd, -1, tapfdSize * sizeof(tapfd[0]));
+ 
+         if (qemuInterfaceBridgeConnect(def, driver, net,
+-                                       tapfd, &tapfdSize, &mtu) < 0)
+                                       tapfd, &tapfdSize) < 0)
+             goto cleanup;
+         break;
+ 
+@@ -8494,7 +8482,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
+     }
+     if (qemuDomainSupportsNicdev(def, net)) {
+         if (!(nic = qemuBuildNicDevStr(def, net, vlan, bootindex,
+-                                       vhostfdSize, qemuCaps, mtu)))
+                                       vhostfdSize, qemuCaps)))
+             goto cleanup;
+         virCommandAddArgList(cmd, "-device", nic, NULL);
+     } else {
+diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
+index 7da92c8c9..09cb00ee9 100644
+--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
+@@ -101,8 +101,7 @@ char *qemuBuildNicDevStr(virDomainDefPtr def,
+                          int vlan,
+                          unsigned int bootindex,
+                          size_t vhostfdSize,
+-                         virQEMUCapsPtr qemuCaps,
+-                         unsigned int mtu);
+                         virQEMUCapsPtr qemuCaps);
+ 
+ char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk);
+ 
+diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
+index f133d04a8..2a4159560 100644
+--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
+@@ -968,7 +968,6 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
+     bool charDevPlugged = false;
+     bool netdevPlugged = false;
+     bool hostPlugged = false;
+-    unsigned int mtu = net->mtu;
+ 
+     /* preallocate new slot for device */
+     if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets + 1) < 0)
+@@ -1025,7 +1024,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
+             goto cleanup;
+         memset(vhostfd, -1, sizeof(*vhostfd) * vhostfdSize);
+         if (qemuInterfaceBridgeConnect(vm->def, driver, net,
+-                                       tapfd, &tapfdSize, &mtu) < 0)
+                                       tapfd, &tapfdSize) < 0)
+             goto cleanup;
+         iface_connected = true;
+         if (qemuInterfaceOpenVhostNet(vm->def, net, priv->qemuCaps,
+@@ -1239,7 +1238,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
+         VIR_FORCE_CLOSE(vhostfd[i]);
+ 
+     if (!(nicstr = qemuBuildNicDevStr(vm->def, net, vlan, 0,
+-                                      queueSize, priv->qemuCaps, mtu)))
+                                      queueSize, priv->qemuCaps)))
+         goto try_remove;
+ 
+     qemuDomainObjEnterMonitor(driver, vm);
+diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c
+index c5dca60f1..ce448d243 100644
+--- a/src/qemu/qemu_interface.c
+++ b/src/qemu/qemu_interface.c
+@@ -503,8 +503,7 @@ qemuInterfaceBridgeConnect(virDomainDefPtr def,
+                            virQEMUDriverPtr driver,
+                            virDomainNetDefPtr net,
+                            int *tapfd,
+-                           size_t *tapfdSize,
+-                           unsigned int *mtu)
+                           size_t *tapfdSize)
+ {
+     const char *brname;
+     int ret = -1;
+@@ -545,7 +544,7 @@ qemuInterfaceBridgeConnect(virDomainDefPtr def,
+                                            def->uuid, tunpath, tapfd, *tapfdSize,
+                                            virDomainNetGetActualVirtPortProfile(net),
+                                            virDomainNetGetActualVlan(net),
+-                                           net->mtu, mtu,
+                                           0, NULL,
+                                            tap_create_flags) < 0) {
+             virDomainAuditNetDevice(def, net, tunpath, false);
+             goto cleanup;
+diff --git a/src/qemu/qemu_interface.h b/src/qemu/qemu_interface.h
+index ba74ac2cf..a7faa0b3d 100644
+--- a/src/qemu/qemu_interface.h
+++ b/src/qemu/qemu_interface.h
+@@ -51,8 +51,7 @@ int qemuInterfaceBridgeConnect(virDomainDefPtr def,
+                                virQEMUDriverPtr driver,
+                                virDomainNetDefPtr net,
+                                int *tapfd,
+-                               size_t *tapfdSize,
+-                               unsigned int *mtu)
+                               size_t *tapfdSize)
+     ATTRIBUTE_NONNULL(2);
+ 
+ int qemuInterfaceOpenVhostNet(virDomainDefPtr def,
@@ -0,0 +1,145 @@
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Wed, 29 Mar 2017 14:45:44 +0200
+Subject: [PATCH] cpu: Introduce virCPUCopyMigratable
+
+This new internal API makes a copy of virCPUDef while removing all
+features which would block migration. It uses cpu_map.xml as a database
+of such features, which should only be used as a fallback when we cannot
+get the data from a hypervisor. The main goal of this API is to decouple
+this filtering from virCPUUpdate so that the hypervisor driver can
+filter the features according to the hypervisor.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit 05e91c79f19e0be96526098d58a3498dac3f8529)
+---
+ src/cpu/cpu.c            | 31 +++++++++++++++++++++++++++++++
+ src/cpu/cpu.h            |  8 ++++++++
+ src/cpu/cpu_x86.c        | 25 +++++++++++++++++++++++++
+ src/libvirt_private.syms |  1 +
+ 4 files changed, 65 insertions(+)
+
+diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
+index 93647a2ed..8a407ac18 100644
+--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
+@@ -1130,3 +1130,34 @@ virCPUExpandFeatures(virArch arch,
+     VIR_DEBUG("nfeatures=%zu", cpu->nfeatures);
+     return 0;
+ }
+
+
+/**
+ * virCPUCopyMigratable:
+ *
+ * @arch: CPU architecture
+ * @cpu: CPU definition to be copied
+ *
+ * Makes a copy of @cpu with all features which would block migration removed.
+ * If this doesn't make sense for a given architecture, the function returns a
+ * plain copy of @cpu (i.e., a copy with no features removed).
+ *
+ * Returns the copy of the CPU or NULL on error.
+ */
+virCPUDefPtr
+virCPUCopyMigratable(virArch arch,
+                     virCPUDefPtr cpu)
+{
+    struct cpuArchDriver *driver;
+
+    VIR_DEBUG("arch=%s, cpu=%p, model=%s",
+              virArchToString(arch), cpu, NULLSTR(cpu->model));
+
+    if (!(driver = cpuGetSubDriver(arch)))
+        return NULL;
+
+    if (driver->copyMigratable)
+        return driver->copyMigratable(cpu);
+    else
+        return virCPUDefCopy(cpu);
+}
+diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
+index 8c238ad55..352445c40 100644
+--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
+@@ -118,6 +118,9 @@ typedef int
+ typedef int
+ (*virCPUArchExpandFeatures)(virCPUDefPtr cpu);
+ 
+typedef virCPUDefPtr
+(*virCPUArchCopyMigratable)(virCPUDefPtr cpu);
+
+ struct cpuArchDriver {
+     const char *name;
+     const virArch *arch;
+@@ -138,6 +141,7 @@ struct cpuArchDriver {
+     virCPUArchTranslate translate;
+     virCPUArchConvertLegacy convertLegacy;
+     virCPUArchExpandFeatures expandFeatures;
+    virCPUArchCopyMigratable copyMigratable;
+ };
+ 
+ 
+@@ -254,6 +258,10 @@ int
+ virCPUExpandFeatures(virArch arch,
+                      virCPUDefPtr cpu);
+ 
+virCPUDefPtr
+virCPUCopyMigratable(virArch arch,
+                     virCPUDefPtr cpu);
+
+ /* virCPUDataFormat and virCPUDataParse are implemented for unit tests only and
+  * have no real-life usage
+  */
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 48648a7f4..a771b251e 100644
+--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
+@@ -2903,6 +2903,30 @@ virCPUx86ExpandFeatures(virCPUDefPtr cpu)
+ }
+ 
+ 
+static virCPUDefPtr
+virCPUx86CopyMigratable(virCPUDefPtr cpu)
+{
+    virCPUDefPtr copy;
+    virCPUx86MapPtr map;
+
+    if (!(map = virCPUx86GetMap()))
+        return NULL;
+
+    if (!(copy = virCPUDefCopyWithoutModel(cpu)))
+        return NULL;
+
+    if (virCPUDefCopyModelFilter(copy, cpu, false,
+                                 x86FeatureIsMigratable, map) < 0)
+        goto error;
+
+    return copy;
+
+ error:
+    virCPUDefFree(copy);
+    return NULL;
+}
+
+
+ int
+ virCPUx86DataAddCPUID(virCPUDataPtr cpuData,
+                       const virCPUx86CPUID *cpuid)
+@@ -2978,4 +3002,5 @@ struct cpuArchDriver cpuDriverX86 = {
+     .getModels  = virCPUx86GetModels,
+     .translate  = virCPUx86Translate,
+     .expandFeatures = virCPUx86ExpandFeatures,
+    .copyMigratable = virCPUx86CopyMigratable,
+ };
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index b551cb86a..dc6db3b28 100644
+--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
+@@ -1016,6 +1016,7 @@ virCPUCheckFeature;
+ virCPUCompare;
+ virCPUCompareXML;
+ virCPUConvertLegacy;
+virCPUCopyMigratable;
+ virCPUDataCheckFeature;
+ virCPUDataFormat;
+ virCPUDataFree;
@@ -0,0 +1,78 @@
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Thu, 30 Mar 2017 13:50:44 +0200
+Subject: [PATCH] qemu: Move common code in virQEMUCapsInitCPUModel one layer
+ up
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit d84b93fad51b190238e18b1daac82ea6e28869e9)
+---
+ src/qemu/qemu_capabilities.c | 25 ++++++++++---------------
+ 1 file changed, 10 insertions(+), 15 deletions(-)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index b1245ad5d..1a15750a3 100644
+--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
+@@ -3111,17 +3111,11 @@ virQEMUCapsCPUFilterFeatures(const char *name,
+  */
+ static int
+ virQEMUCapsInitCPUModelS390(virQEMUCapsPtr qemuCaps,
+-                            virDomainVirtType type,
+                            qemuMonitorCPUModelInfoPtr modelInfo,
+                             virCPUDefPtr cpu)
+ {
+-    qemuMonitorCPUModelInfoPtr modelInfo;
+     size_t i;
+ 
+-    if (type == VIR_DOMAIN_VIRT_KVM)
+-        modelInfo = qemuCaps->kvmCPUModelInfo;
+-    else
+-        modelInfo = qemuCaps->tcgCPUModelInfo;
+-
+     if (!modelInfo) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("missing host CPU model info from QEMU capabilities "
+@@ -3163,9 +3157,9 @@ virQEMUCapsInitCPUModelS390(virQEMUCapsPtr qemuCaps,
+ static int
+ virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps,
+                            virDomainVirtType type,
+                           qemuMonitorCPUModelInfoPtr model,
+                            virCPUDefPtr cpu)
+ {
+-    qemuMonitorCPUModelInfoPtr model;
+     virCPUDataPtr data = NULL;
+     unsigned long long sigFamily = 0;
+     unsigned long long sigModel = 0;
+@@ -3174,11 +3168,6 @@ virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps,
+     int ret = -1;
+     size_t i;
+ 
+-    if (type == VIR_DOMAIN_VIRT_KVM)
+-        model = qemuCaps->kvmCPUModelInfo;
+-    else
+-        model = qemuCaps->tcgCPUModelInfo;
+-
+     if (!model)
+         return 1;
+ 
+@@ -3239,12 +3228,18 @@ virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps,
+                         virDomainVirtType type,
+                         virCPUDefPtr cpu)
+ {
+    qemuMonitorCPUModelInfoPtr model;
+     int ret = 1;
+ 
+    if (type == VIR_DOMAIN_VIRT_KVM)
+        model = qemuCaps->kvmCPUModelInfo;
+    else
+        model = qemuCaps->tcgCPUModelInfo;
+
+     if (ARCH_IS_S390(qemuCaps->arch))
+-        ret = virQEMUCapsInitCPUModelS390(qemuCaps, type, cpu);
+        ret = virQEMUCapsInitCPUModelS390(qemuCaps, model, cpu);
+     else if (ARCH_IS_X86(qemuCaps->arch))
+-        ret = virQEMUCapsInitCPUModelX86(qemuCaps, type, cpu);
+        ret = virQEMUCapsInitCPUModelX86(qemuCaps, type, model, cpu);
+ 
+     if (ret == 0)
+         cpu->fallback = VIR_CPU_FALLBACK_FORBID;
@@ -0,0 +1,139 @@
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Wed, 29 Mar 2017 13:33:50 +0200
+Subject: [PATCH] qemu: Add migratable parameter to virQEMUCapsInitCPUModel
+
+The caller can ask for a migratable CPU model by passing true for the
+new parameter.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit 00e0cbcb567a57c7b5a145d7fd3fb662779f6bec)
+---
+ src/qemu/qemu_capabilities.c | 36 +++++++++++++++++++++++++-----------
+ src/qemu/qemu_capspriv.h     |  3 ++-
+ tests/cputest.c              |  2 +-
+ 3 files changed, 28 insertions(+), 13 deletions(-)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index 1a15750a3..b8e4e47b6 100644
+--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
+@@ -3112,7 +3112,8 @@ virQEMUCapsCPUFilterFeatures(const char *name,
+ static int
+ virQEMUCapsInitCPUModelS390(virQEMUCapsPtr qemuCaps,
+                             qemuMonitorCPUModelInfoPtr modelInfo,
+-                            virCPUDefPtr cpu)
+                            virCPUDefPtr cpu,
+                            bool migratable)
+ {
+     size_t i;
+ 
+@@ -3140,8 +3141,12 @@ virQEMUCapsInitCPUModelS390(virQEMUCapsPtr qemuCaps,
+ 
+         if (VIR_STRDUP(feature->name, prop->name) < 0)
+             return -1;
+-        feature->policy = prop->value.boolean ? VIR_CPU_FEATURE_REQUIRE
+-                                              : VIR_CPU_FEATURE_DISABLE;
+
+        if (!prop->value.boolean ||
+            (migratable && prop->migratable == VIR_TRISTATE_BOOL_NO))
+            feature->policy = VIR_CPU_FEATURE_DISABLE;
+        else
+            feature->policy = VIR_CPU_FEATURE_REQUIRE;
+         cpu->nfeatures++;
+     }
+ 
+@@ -3158,7 +3163,8 @@ static int
+ virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps,
+                            virDomainVirtType type,
+                            qemuMonitorCPUModelInfoPtr model,
+-                           virCPUDefPtr cpu)
+                           virCPUDefPtr cpu,
+                           bool migratable)
+ {
+     virCPUDataPtr data = NULL;
+     unsigned long long sigFamily = 0;
+@@ -3179,9 +3185,13 @@ virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps,
+ 
+         switch (prop->type) {
+         case QEMU_MONITOR_CPU_PROPERTY_BOOLEAN:
+-            if (prop->value.boolean &&
+-                virCPUx86DataAddFeature(data, prop->name) < 0)
+            if (!prop->value.boolean ||
+                (migratable && prop->migratable == VIR_TRISTATE_BOOL_NO))
+                continue;
+
+            if (virCPUx86DataAddFeature(data, prop->name) < 0)
+                 goto cleanup;
+
+             break;
+ 
+         case QEMU_MONITOR_CPU_PROPERTY_STRING:
+@@ -3220,13 +3230,14 @@ virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps,
+ 
+ /**
+  * Returns  0 when host CPU model provided by QEMU was filled in qemuCaps,
+- *          1 when the caller should fall back to using virCapsPtr->host.cpu,
+ *          1 when the caller should fall back to other methods
+  *         -1 on error.
+  */
+ int
+ virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps,
+                         virDomainVirtType type,
+-                        virCPUDefPtr cpu)
+                        virCPUDefPtr cpu,
+                        bool migratable)
+ {
+     qemuMonitorCPUModelInfoPtr model;
+     int ret = 1;
+@@ -3236,10 +3247,13 @@ virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps,
+     else
+         model = qemuCaps->tcgCPUModelInfo;
+ 
+    if (migratable && model && !model->migratability)
+        return 1;
+
+     if (ARCH_IS_S390(qemuCaps->arch))
+-        ret = virQEMUCapsInitCPUModelS390(qemuCaps, model, cpu);
+        ret = virQEMUCapsInitCPUModelS390(qemuCaps, model, cpu, migratable);
+     else if (ARCH_IS_X86(qemuCaps->arch))
+-        ret = virQEMUCapsInitCPUModelX86(qemuCaps, type, model, cpu);
+        ret = virQEMUCapsInitCPUModelX86(qemuCaps, type, model, cpu, migratable);
+ 
+     if (ret == 0)
+         cpu->fallback = VIR_CPU_FALLBACK_FORBID;
+@@ -3268,7 +3282,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
+     cpu->match = VIR_CPU_MATCH_EXACT;
+     cpu->fallback = VIR_CPU_FALLBACK_ALLOW;
+ 
+-    if ((rc = virQEMUCapsInitCPUModel(qemuCaps, type, cpu)) < 0) {
+    if ((rc = virQEMUCapsInitCPUModel(qemuCaps, type, cpu, false)) < 0) {
+         goto error;
+     } else if (rc == 1) {
+         VIR_DEBUG("No host CPU model info from QEMU; probing host CPU directly");
+diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h
+index 61ccd4517..1baaaf334 100644
+--- a/src/qemu/qemu_capspriv.h
+++ b/src/qemu/qemu_capspriv.h
+@@ -81,7 +81,8 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
+ int
+ virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps,
+                         virDomainVirtType type,
+-                        virCPUDefPtr cpu);
+                        virCPUDefPtr cpu,
+                        bool migratable);
+ 
+ void
+ virQEMUCapsSetCPUModelInfo(virQEMUCapsPtr qemuCaps,
+diff --git a/tests/cputest.c b/tests/cputest.c
+index 3d3e43f16..8c07cf4f6 100644
+--- a/tests/cputest.c
+++ b/tests/cputest.c
+@@ -709,7 +709,7 @@ cpuTestJSONCPUID(const void *arg)
+     cpu->match = VIR_CPU_MATCH_EXACT;
+     cpu->fallback = VIR_CPU_FALLBACK_FORBID;
+ 
+-    if (virQEMUCapsInitCPUModel(qemuCaps, VIR_DOMAIN_VIRT_KVM, cpu) != 0)
+    if (virQEMUCapsInitCPUModel(qemuCaps, VIR_DOMAIN_VIRT_KVM, cpu, false) != 0)
+         goto cleanup;
+ 
+     ret = cpuTestCompareXML(data->arch, cpu, result, false);
@@ -0,0 +1,47 @@
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Fri, 7 Apr 2017 17:03:38 +0200
+Subject: [PATCH] qemu: Introduce virQEMUCapsSetHostModel
+
+A simple helper as a complement to virQEMUCapsGetHostModel.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit bffc3b9fe501ff122ad81ddf42ecdb69f70ff70a)
+---
+ src/qemu/qemu_capabilities.c | 17 +++++++++++++----
+ 1 file changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index b8e4e47b6..f6020b86d 100644
+--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
+@@ -2419,6 +2419,18 @@ virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps,
+ }
+ 
+ 
+static void
+virQEMUCapsSetHostModel(virQEMUCapsPtr qemuCaps,
+                        virDomainVirtType type,
+                        virCPUDefPtr cpu)
+{
+    if (type == VIR_DOMAIN_VIRT_KVM)
+        qemuCaps->kvmCPUModel = cpu;
+    else
+        qemuCaps->tcgCPUModel = cpu;
+}
+
+
+ bool
+ virQEMUCapsIsCPUModeSupported(virQEMUCapsPtr qemuCaps,
+                               virCapsPtr caps,
+@@ -3295,10 +3307,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
+             goto error;
+     }
+ 
+-    if (type == VIR_DOMAIN_VIRT_KVM)
+-        qemuCaps->kvmCPUModel = cpu;
+-    else
+-        qemuCaps->tcgCPUModel = cpu;
+    virQEMUCapsSetHostModel(qemuCaps, type, cpu);
+ 
+  cleanup:
+     virCPUDefFree(hostCPU);
@@ -0,0 +1,70 @@
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Fri, 7 Apr 2017 17:40:31 +0200
+Subject: [PATCH] qemu: Move qemuCaps CPU data copying into a separate function
+
+This introduces virQEMUCapsHostCPUDataCopy which will later be
+refactored a bit and called twice from virQEMUCapsNewCopy.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit 8be4346ca5ae4b568b3e8ce3de9cf46f2e94b416)
+---
+ src/qemu/qemu_capabilities.c | 39 +++++++++++++++++++++++++--------------
+ 1 file changed, 25 insertions(+), 14 deletions(-)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index f6020b86d..d17e0e8b8 100644
+--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
+@@ -2082,6 +2082,30 @@ virQEMUCapsNew(void)
+ }
+ 
+ 
+static int
+virQEMUCapsHostCPUDataCopy(virQEMUCapsPtr dst,
+                           virQEMUCapsPtr src)
+{
+    if (src->kvmCPUModel &&
+        !(dst->kvmCPUModel = virCPUDefCopy(src->kvmCPUModel)))
+        return -1;
+
+    if (src->tcgCPUModel &&
+        !(dst->tcgCPUModel = virCPUDefCopy(src->tcgCPUModel)))
+        return -1;
+
+    if (src->kvmCPUModelInfo &&
+        !(dst->kvmCPUModelInfo = qemuMonitorCPUModelInfoCopy(src->kvmCPUModelInfo)))
+        return -1;
+
+    if (src->tcgCPUModelInfo &&
+        !(dst->tcgCPUModelInfo = qemuMonitorCPUModelInfoCopy(src->tcgCPUModelInfo)))
+        return -1;
+
+    return 0;
+}
+
+
+ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps)
+ {
+     virQEMUCapsPtr ret = virQEMUCapsNew();
+@@ -2119,20 +2143,7 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps)
+             goto error;
+     }
+ 
+-    if (qemuCaps->kvmCPUModel &&
+-        !(ret->kvmCPUModel = virCPUDefCopy(qemuCaps->kvmCPUModel)))
+-        goto error;
+-
+-    if (qemuCaps->tcgCPUModel &&
+-        !(ret->tcgCPUModel = virCPUDefCopy(qemuCaps->tcgCPUModel)))
+-        goto error;
+-
+-    if (qemuCaps->kvmCPUModelInfo &&
+-        !(ret->kvmCPUModelInfo = qemuMonitorCPUModelInfoCopy(qemuCaps->kvmCPUModelInfo)))
+-        goto error;
+-
+-    if (qemuCaps->tcgCPUModelInfo &&
+-        !(ret->tcgCPUModelInfo = qemuMonitorCPUModelInfoCopy(qemuCaps->tcgCPUModelInfo)))
+    if (virQEMUCapsHostCPUDataCopy(ret, qemuCaps) < 0)
+         goto error;
+ 
+     if (VIR_ALLOC_N(ret->machineTypes, qemuCaps->nmachineTypes) < 0)
@@ -0,0 +1,67 @@
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Fri, 7 Apr 2017 17:43:59 +0200
+Subject: [PATCH] qemu: Introduce virQEMUCapsHostCPUDataClear
+
+To keep freeing of host CPU data in one place.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit b0605e848724c5dc478382398b734398abff674c)
+---
+ src/qemu/qemu_capabilities.c | 30 +++++++++++++++++-------------
+ 1 file changed, 17 insertions(+), 13 deletions(-)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index d17e0e8b8..2da53a60b 100644
+--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
+@@ -2106,6 +2106,21 @@ virQEMUCapsHostCPUDataCopy(virQEMUCapsPtr dst,
+ }
+ 
+ 
+static void
+virQEMUCapsHostCPUDataClear(virQEMUCapsPtr qemuCaps)
+{
+    qemuMonitorCPUModelInfoFree(qemuCaps->kvmCPUModelInfo);
+    qemuMonitorCPUModelInfoFree(qemuCaps->tcgCPUModelInfo);
+    qemuCaps->kvmCPUModelInfo = NULL;
+    qemuCaps->tcgCPUModelInfo = NULL;
+
+    virCPUDefFree(qemuCaps->kvmCPUModel);
+    virCPUDefFree(qemuCaps->tcgCPUModel);
+    qemuCaps->kvmCPUModel = NULL;
+    qemuCaps->tcgCPUModel = NULL;
+}
+
+
+ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps)
+ {
+     virQEMUCapsPtr ret = virQEMUCapsNew();
+@@ -2192,10 +2207,7 @@ void virQEMUCapsDispose(void *obj)
+ 
+     VIR_FREE(qemuCaps->gicCapabilities);
+ 
+-    qemuMonitorCPUModelInfoFree(qemuCaps->kvmCPUModelInfo);
+-    qemuMonitorCPUModelInfoFree(qemuCaps->tcgCPUModelInfo);
+-    virCPUDefFree(qemuCaps->kvmCPUModel);
+-    virCPUDefFree(qemuCaps->tcgCPUModel);
+    virQEMUCapsHostCPUDataClear(qemuCaps);
+ }
+ 
+ void
+@@ -4068,15 +4080,7 @@ virQEMUCapsReset(virQEMUCapsPtr qemuCaps)
+     VIR_FREE(qemuCaps->gicCapabilities);
+     qemuCaps->ngicCapabilities = 0;
+ 
+-    qemuMonitorCPUModelInfoFree(qemuCaps->kvmCPUModelInfo);
+-    qemuMonitorCPUModelInfoFree(qemuCaps->tcgCPUModelInfo);
+-    qemuCaps->kvmCPUModelInfo = NULL;
+-    qemuCaps->tcgCPUModelInfo = NULL;
+-
+-    virCPUDefFree(qemuCaps->kvmCPUModel);
+-    virCPUDefFree(qemuCaps->tcgCPUModel);
+-    qemuCaps->kvmCPUModel = NULL;
+-    qemuCaps->tcgCPUModel = NULL;
+    virQEMUCapsHostCPUDataClear(qemuCaps);
+ }
+ 
+ 
@@ -0,0 +1,342 @@
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Fri, 7 Apr 2017 18:15:26 +0200
+Subject: [PATCH] qemu: Move qemuCaps host CPU data in a struct
+
+We need to store several CPU related data structure for both KVM and
+TCG. So instead of keeping two different copies of everything let's
+make a virQEMUCapsHostCPUData struct and use it twice.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit b0a84ffb7f38f990120c231cfb74956a0ed10d95)
+---
+ src/qemu/qemu_capabilities.c | 168 +++++++++++++++++++++----------------------
+ 1 file changed, 82 insertions(+), 86 deletions(-)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index 2da53a60b..bbb234538 100644
+--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
+@@ -373,6 +373,19 @@ struct virQEMUCapsMachineType {
+     unsigned int maxCpus;
+     bool hotplugCpus;
+ };
+
+typedef struct _virQEMUCapsHostCPUData virQEMUCapsHostCPUData;
+typedef virQEMUCapsHostCPUData *virQEMUCapsHostCPUDataPtr;
+struct _virQEMUCapsHostCPUData {
+    /* Only the "info" part is stored in the capabilities cache, the rest is
+     * re-computed from other fields and external data sources everytime we
+     * probe QEMU or load the cache.
+     */
+    qemuMonitorCPUModelInfoPtr info;
+    /* Host CPU definition reported in domain capabilities. */
+    virCPUDefPtr reported;
+};
+
+ /*
+  * Update the XML parser/formatter when adding more
+  * information to this struct so that it gets cached
+@@ -407,15 +420,8 @@ struct _virQEMUCaps {
+     size_t ngicCapabilities;
+     virGICCapability *gicCapabilities;
+ 
+-    qemuMonitorCPUModelInfoPtr kvmCPUModelInfo;
+-    qemuMonitorCPUModelInfoPtr tcgCPUModelInfo;
+-
+-    /* Anything below is not stored in the cache since the values are
+-     * re-computed from the other fields or external data sources every
+-     * time we probe QEMU or load the results from the cache.
+-     */
+-    virCPUDefPtr kvmCPUModel;
+-    virCPUDefPtr tcgCPUModel;
+    virQEMUCapsHostCPUData kvmCPU;
+    virQEMUCapsHostCPUData tcgCPU;
+ };
+ 
+ struct virQEMUCapsSearchData {
+@@ -2083,23 +2089,15 @@ virQEMUCapsNew(void)
+ 
+ 
+ static int
+-virQEMUCapsHostCPUDataCopy(virQEMUCapsPtr dst,
+-                           virQEMUCapsPtr src)
+virQEMUCapsHostCPUDataCopy(virQEMUCapsHostCPUDataPtr dst,
+                           virQEMUCapsHostCPUDataPtr src)
+ {
+-    if (src->kvmCPUModel &&
+-        !(dst->kvmCPUModel = virCPUDefCopy(src->kvmCPUModel)))
+    if (src->info &&
+        !(dst->info = qemuMonitorCPUModelInfoCopy(src->info)))
+         return -1;
+ 
+-    if (src->tcgCPUModel &&
+-        !(dst->tcgCPUModel = virCPUDefCopy(src->tcgCPUModel)))
+-        return -1;
+-
+-    if (src->kvmCPUModelInfo &&
+-        !(dst->kvmCPUModelInfo = qemuMonitorCPUModelInfoCopy(src->kvmCPUModelInfo)))
+-        return -1;
+-
+-    if (src->tcgCPUModelInfo &&
+-        !(dst->tcgCPUModelInfo = qemuMonitorCPUModelInfoCopy(src->tcgCPUModelInfo)))
+    if (src->reported &&
+        !(dst->reported = virCPUDefCopy(src->reported)))
+         return -1;
+ 
+     return 0;
+@@ -2107,17 +2105,12 @@ virQEMUCapsHostCPUDataCopy(virQEMUCapsPtr dst,
+ 
+ 
+ static void
+-virQEMUCapsHostCPUDataClear(virQEMUCapsPtr qemuCaps)
+virQEMUCapsHostCPUDataClear(virQEMUCapsHostCPUDataPtr cpuData)
+ {
+-    qemuMonitorCPUModelInfoFree(qemuCaps->kvmCPUModelInfo);
+-    qemuMonitorCPUModelInfoFree(qemuCaps->tcgCPUModelInfo);
+-    qemuCaps->kvmCPUModelInfo = NULL;
+-    qemuCaps->tcgCPUModelInfo = NULL;
+-
+-    virCPUDefFree(qemuCaps->kvmCPUModel);
+-    virCPUDefFree(qemuCaps->tcgCPUModel);
+-    qemuCaps->kvmCPUModel = NULL;
+-    qemuCaps->tcgCPUModel = NULL;
+    qemuMonitorCPUModelInfoFree(cpuData->info);
+    virCPUDefFree(cpuData->reported);
+
+    memset(cpuData, 0, sizeof(*cpuData));
+ }
+ 
+ 
+@@ -2158,7 +2151,8 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps)
+             goto error;
+     }
+ 
+-    if (virQEMUCapsHostCPUDataCopy(ret, qemuCaps) < 0)
+    if (virQEMUCapsHostCPUDataCopy(&ret->kvmCPU, &qemuCaps->kvmCPU) < 0 ||
+        virQEMUCapsHostCPUDataCopy(&ret->tcgCPU, &qemuCaps->tcgCPU) < 0)
+         goto error;
+ 
+     if (VIR_ALLOC_N(ret->machineTypes, qemuCaps->nmachineTypes) < 0)
+@@ -2207,7 +2201,8 @@ void virQEMUCapsDispose(void *obj)
+ 
+     VIR_FREE(qemuCaps->gicCapabilities);
+ 
+-    virQEMUCapsHostCPUDataClear(qemuCaps);
+    virQEMUCapsHostCPUDataClear(&qemuCaps->kvmCPU);
+    virQEMUCapsHostCPUDataClear(&qemuCaps->tcgCPU);
+ }
+ 
+ void
+@@ -2431,14 +2426,24 @@ virQEMUCapsGetCPUDefinitions(virQEMUCapsPtr qemuCaps,
+ }
+ 
+ 
+static virQEMUCapsHostCPUDataPtr
+virQEMUCapsGetHostCPUData(virQEMUCapsPtr qemuCaps,
+                          virDomainVirtType type)
+{
+    if (type == VIR_DOMAIN_VIRT_KVM)
+        return &qemuCaps->kvmCPU;
+    else
+        return &qemuCaps->tcgCPU;
+}
+
+
+ virCPUDefPtr
+ virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps,
+                         virDomainVirtType type)
+ {
+-    if (type == VIR_DOMAIN_VIRT_KVM)
+-        return qemuCaps->kvmCPUModel;
+-    else
+-        return qemuCaps->tcgCPUModel;
+    virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type);
+
+    return cpuData->reported;
+ }
+ 
+ 
+@@ -2447,10 +2452,9 @@ virQEMUCapsSetHostModel(virQEMUCapsPtr qemuCaps,
+                         virDomainVirtType type,
+                         virCPUDefPtr cpu)
+ {
+-    if (type == VIR_DOMAIN_VIRT_KVM)
+-        qemuCaps->kvmCPUModel = cpu;
+-    else
+-        qemuCaps->tcgCPUModel = cpu;
+    virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type);
+
+    cpuData->reported = cpu;
+ }
+ 
+ 
+@@ -2841,24 +2845,28 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps,
+                            qemuMonitorPtr mon,
+                            bool tcg)
+ {
+-    qemuMonitorCPUModelInfoPtr *modelInfo;
+    qemuMonitorCPUModelInfoPtr modelInfo = NULL;
+     qemuMonitorCPUModelInfoPtr nonMigratable = NULL;
+     virHashTablePtr hash = NULL;
+     const char *model;
+     qemuMonitorCPUModelExpansionType type;
+    virDomainVirtType virtType;
+    virQEMUCapsHostCPUDataPtr cpuData;
+     int ret = -1;
+ 
+     if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION))
+         return 0;
+ 
+     if (tcg || !virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) {
+-        modelInfo = &qemuCaps->tcgCPUModelInfo;
+        virtType = VIR_DOMAIN_VIRT_QEMU;
+         model = "max";
+     } else {
+-        modelInfo = &qemuCaps->kvmCPUModelInfo;
+        virtType = VIR_DOMAIN_VIRT_KVM;
+         model = "host";
+     }
+ 
+    cpuData = virQEMUCapsGetHostCPUData(qemuCaps, virtType);
+
+     /* Some x86_64 features defined in cpu_map.xml use spelling which differ
+      * from the one preferred by QEMU. Static expansion would give us only the
+      * preferred spelling, thus we need to do a full expansion on the result of
+@@ -2869,14 +2877,14 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps,
+     else
+         type = QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC;
+ 
+-    if (qemuMonitorGetCPUModelExpansion(mon, type, model, true, modelInfo) < 0)
+-        return -1;
+    if (qemuMonitorGetCPUModelExpansion(mon, type, model, true, &modelInfo) < 0)
+        goto cleanup;
+ 
+     /* Try to check migratability of each feature. */
+-    if (*modelInfo &&
+    if (modelInfo &&
+         qemuMonitorGetCPUModelExpansion(mon, type, model, false,
+                                         &nonMigratable) < 0)
+-        goto error;
+        goto cleanup;
+ 
+     if (nonMigratable) {
+         qemuMonitorCPUPropertyPtr prop;
+@@ -2884,12 +2892,12 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps,
+         size_t i;
+ 
+         if (!(hash = virHashCreate(0, NULL)))
+-            goto error;
+            goto cleanup;
+ 
+-        for (i = 0; i < (*modelInfo)->nprops; i++) {
+-            prop = (*modelInfo)->props + i;
+        for (i = 0; i < modelInfo->nprops; i++) {
+            prop = modelInfo->props + i;
+             if (virHashAddEntry(hash, prop->name, prop) < 0)
+-                goto error;
+                goto cleanup;
+         }
+ 
+         for (i = 0; i < nonMigratable->nprops; i++) {
+@@ -2907,21 +2915,18 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps,
+             }
+         }
+ 
+-        (*modelInfo)->migratability = true;
+        modelInfo->migratability = true;
+     }
+ 
+    VIR_STEAL_PTR(cpuData->info, modelInfo);
+     ret = 0;
+ 
+  cleanup:
+     virHashFree(hash);
+     qemuMonitorCPUModelInfoFree(nonMigratable);
+    qemuMonitorCPUModelInfoFree(modelInfo);
+ 
+     return ret;
+-
+- error:
+-    qemuMonitorCPUModelInfoFree(*modelInfo);
+-    *modelInfo = NULL;
+-    goto cleanup;
+ }
+ 
+ struct tpmTypeToCaps {
+@@ -3274,21 +3279,19 @@ virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps,
+                         virCPUDefPtr cpu,
+                         bool migratable)
+ {
+-    qemuMonitorCPUModelInfoPtr model;
+    virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type);
+     int ret = 1;
+ 
+-    if (type == VIR_DOMAIN_VIRT_KVM)
+-        model = qemuCaps->kvmCPUModelInfo;
+-    else
+-        model = qemuCaps->tcgCPUModelInfo;
+-
+-    if (migratable && model && !model->migratability)
+    if (migratable && cpuData->info && !cpuData->info->migratability)
+         return 1;
+ 
+-    if (ARCH_IS_S390(qemuCaps->arch))
+-        ret = virQEMUCapsInitCPUModelS390(qemuCaps, model, cpu, migratable);
+-    else if (ARCH_IS_X86(qemuCaps->arch))
+-        ret = virQEMUCapsInitCPUModelX86(qemuCaps, type, model, cpu, migratable);
+    if (ARCH_IS_S390(qemuCaps->arch)) {
+        ret = virQEMUCapsInitCPUModelS390(qemuCaps, cpuData->info,
+                                          cpu, migratable);
+    } else if (ARCH_IS_X86(qemuCaps->arch)) {
+        ret = virQEMUCapsInitCPUModelX86(qemuCaps, type, cpuData->info,
+                                         cpu, migratable);
+    }
+ 
+     if (ret == 0)
+         cpu->fallback = VIR_CPU_FALLBACK_FORBID;
+@@ -3348,10 +3351,9 @@ virQEMUCapsSetCPUModelInfo(virQEMUCapsPtr qemuCaps,
+                            virDomainVirtType type,
+                            qemuMonitorCPUModelInfoPtr modelInfo)
+ {
+-    if (type == VIR_DOMAIN_VIRT_KVM)
+-        qemuCaps->kvmCPUModelInfo = modelInfo;
+-    else
+-        qemuCaps->tcgCPUModelInfo = modelInfo;
+    virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type);
+
+    cpuData->info = modelInfo;
+ }
+ 
+ 
+@@ -3810,18 +3812,11 @@ virQEMUCapsFormatHostCPUModelInfo(virQEMUCapsPtr qemuCaps,
+                                   virBufferPtr buf,
+                                   virDomainVirtType type)
+ {
+-    qemuMonitorCPUModelInfoPtr model;
+-    const char *typeStr;
+    virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type);
+    qemuMonitorCPUModelInfoPtr model = cpuData->info;
+    const char *typeStr = type == VIR_DOMAIN_VIRT_KVM ? "kvm" : "tcg";
+     size_t i;
+ 
+-    if (type == VIR_DOMAIN_VIRT_KVM) {
+-        typeStr = "kvm";
+-        model = qemuCaps->kvmCPUModelInfo;
+-    } else {
+-        typeStr = "tcg";
+-        model = qemuCaps->tcgCPUModelInfo;
+-    }
+-
+     if (!model)
+         return;
+ 
+@@ -4080,7 +4075,8 @@ virQEMUCapsReset(virQEMUCapsPtr qemuCaps)
+     VIR_FREE(qemuCaps->gicCapabilities);
+     qemuCaps->ngicCapabilities = 0;
+ 
+-    virQEMUCapsHostCPUDataClear(qemuCaps);
+    virQEMUCapsHostCPUDataClear(&qemuCaps->kvmCPU);
+    virQEMUCapsHostCPUDataClear(&qemuCaps->tcgCPU);
+ }
+ 
+ 
@@ -0,0 +1,119 @@
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 11 Apr 2017 11:14:30 +0200
+Subject: [PATCH] qemu: Prepare qemuCaps for multiple host CPU defs
+
+Soon we will need to store multiple host CPU definitions in
+virQEMUCapsHostCPUData and qemuCaps users will want to request the one
+they need. This patch introduces virQEMUCapsHostCPUType enum which will
+be used for specifying the requested CPU definition.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit 1fe517c68df92eb7f379fa87cb0d29d566aad6f4)
+---
+ src/qemu/qemu_capabilities.c | 16 ++++++++++++----
+ src/qemu/qemu_capabilities.h | 10 +++++++++-
+ src/qemu/qemu_command.c      |  3 ++-
+ src/qemu/qemu_process.c      |  6 ++++--
+ 4 files changed, 27 insertions(+), 8 deletions(-)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index bbb234538..a6324a398 100644
+--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
+@@ -2439,11 +2439,17 @@ virQEMUCapsGetHostCPUData(virQEMUCapsPtr qemuCaps,
+ 
+ virCPUDefPtr
+ virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps,
+-                        virDomainVirtType type)
+                        virDomainVirtType type,
+                        virQEMUCapsHostCPUType cpuType)
+ {
+     virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type);
+ 
+-    return cpuData->reported;
+    switch (cpuType) {
+    case VIR_QEMU_CAPS_HOST_CPU_REPORTED:
+        return cpuData->reported;
+    }
+
+    return NULL;
+ }
+ 
+ 
+@@ -2472,7 +2478,8 @@ virQEMUCapsIsCPUModeSupported(virQEMUCapsPtr qemuCaps,
+                virQEMUCapsGuestIsNative(caps->host.arch, qemuCaps->arch);
+ 
+     case VIR_CPU_MODE_HOST_MODEL:
+-        return !!virQEMUCapsGetHostModel(qemuCaps, type);
+        return !!virQEMUCapsGetHostModel(qemuCaps, type,
+                                         VIR_QEMU_CAPS_HOST_CPU_REPORTED);
+ 
+     case VIR_CPU_MODE_CUSTOM:
+         if (type == VIR_DOMAIN_VIRT_KVM)
+@@ -5456,7 +5463,8 @@ virQEMUCapsFillDomainCPUCaps(virCapsPtr caps,
+ 
+     if (virQEMUCapsIsCPUModeSupported(qemuCaps, caps, domCaps->virttype,
+                                       VIR_CPU_MODE_HOST_MODEL)) {
+-        virCPUDefPtr cpu = virQEMUCapsGetHostModel(qemuCaps, domCaps->virttype);
+        virCPUDefPtr cpu = virQEMUCapsGetHostModel(qemuCaps, domCaps->virttype,
+                                                   VIR_QEMU_CAPS_HOST_CPU_REPORTED);
+         domCaps->cpu.hostModel = virCPUDefCopy(cpu);
+     }
+ 
+diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
+index d44682f2a..88e27855b 100644
+--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
+@@ -449,8 +449,16 @@ int virQEMUCapsGetCPUDefinitions(virQEMUCapsPtr qemuCaps,
+                                  virDomainVirtType type,
+                                  char ***names,
+                                  size_t *count);
+
+typedef enum {
+    /* Host CPU definition reported in domain capabilities. */
+    VIR_QEMU_CAPS_HOST_CPU_REPORTED,
+} virQEMUCapsHostCPUType;
+
+ virCPUDefPtr virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps,
+-                                     virDomainVirtType type);
+                                     virDomainVirtType type,
+                                     virQEMUCapsHostCPUType cpuType);
+
+ bool virQEMUCapsIsCPUModeSupported(virQEMUCapsPtr qemuCaps,
+                                    virCapsPtr caps,
+                                    virDomainVirtType type,
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index 3abfe7b55..311edd13e 100644
+--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
+@@ -6879,7 +6879,8 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
+             if (def->cpu->mode == VIR_CPU_MODE_CUSTOM)
+                 cpuDef = def->cpu;
+             else if (def->cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH)
+-                cpuDef = virQEMUCapsGetHostModel(qemuCaps, def->virtType);
+                cpuDef = virQEMUCapsGetHostModel(qemuCaps, def->virtType,
+                                                 VIR_QEMU_CAPS_HOST_CPU_REPORTED);
+ 
+             if (cpuDef) {
+                 int svm = virCPUCheckFeature(def->os.arch, cpuDef, "svm");
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index 26a668d27..07a88a3a7 100644
+--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
+@@ -5299,12 +5299,14 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def,
+ 
+     if (def->cpu->check == VIR_CPU_CHECK_PARTIAL &&
+         virCPUCompare(caps->host.arch,
+-                      virQEMUCapsGetHostModel(qemuCaps, def->virtType),
+                      virQEMUCapsGetHostModel(qemuCaps, def->virtType,
+                                              VIR_QEMU_CAPS_HOST_CPU_REPORTED),
+                       def->cpu, true) < 0)
+         return -1;
+ 
+     if (virCPUUpdate(def->os.arch, def->cpu,
+-                     virQEMUCapsGetHostModel(qemuCaps, def->virtType)) < 0)
+                     virQEMUCapsGetHostModel(qemuCaps, def->virtType,
+                                             VIR_QEMU_CAPS_HOST_CPU_REPORTED)) < 0)
+         goto cleanup;
+ 
+     if (virQEMUCapsGetCPUDefinitions(qemuCaps, def->virtType,
@@ -0,0 +1,210 @@
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Wed, 29 Mar 2017 15:31:17 +0200
+Subject: [PATCH] qemu: Pass migratable host CPU model to virCPUUpdate
+
+We already know from QEMU which CPU features will block migration. Let's
+use this information to make a migratable copy of the host CPU model and
+use it for updating guest CPU specification. This will allow us to drop
+feature filtering from virCPUUpdate where it was just a hack.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit 56bd7edcb5dc878beffb80d4e6a9cfb812378ded)
+---
+ src/qemu/qemu_capabilities.c | 57 +++++++++++++++++++++++++++++++++++++-------
+ src/qemu/qemu_capabilities.h |  2 ++
+ src/qemu/qemu_process.c      |  2 +-
+ tests/cputest.c              |  7 +++++-
+ 4 files changed, 57 insertions(+), 11 deletions(-)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index a6324a398..7fc577546 100644
+--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
+@@ -384,6 +384,8 @@ struct _virQEMUCapsHostCPUData {
+     qemuMonitorCPUModelInfoPtr info;
+     /* Host CPU definition reported in domain capabilities. */
+     virCPUDefPtr reported;
+    /* Migratable host CPU definition used for updating guest CPU. */
+    virCPUDefPtr migratable;
+ };
+ 
+ /*
+@@ -2100,6 +2102,10 @@ virQEMUCapsHostCPUDataCopy(virQEMUCapsHostCPUDataPtr dst,
+         !(dst->reported = virCPUDefCopy(src->reported)))
+         return -1;
+ 
+    if (src->migratable &&
+        !(dst->migratable = virCPUDefCopy(src->migratable)))
+        return -1;
+
+     return 0;
+ }
+ 
+@@ -2109,6 +2115,7 @@ virQEMUCapsHostCPUDataClear(virQEMUCapsHostCPUDataPtr cpuData)
+ {
+     qemuMonitorCPUModelInfoFree(cpuData->info);
+     virCPUDefFree(cpuData->reported);
+    virCPUDefFree(cpuData->migratable);
+ 
+     memset(cpuData, 0, sizeof(*cpuData));
+ }
+@@ -2447,6 +2454,9 @@ virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps,
+     switch (cpuType) {
+     case VIR_QEMU_CAPS_HOST_CPU_REPORTED:
+         return cpuData->reported;
+
+    case VIR_QEMU_CAPS_HOST_CPU_MIGRATABLE:
+        return cpuData->migratable;
+     }
+ 
+     return NULL;
+@@ -2456,11 +2466,13 @@ virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps,
+ static void
+ virQEMUCapsSetHostModel(virQEMUCapsPtr qemuCaps,
+                         virDomainVirtType type,
+-                        virCPUDefPtr cpu)
+                        virCPUDefPtr reported,
+                        virCPUDefPtr migratable)
+ {
+     virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type);
+ 
+-    cpuData->reported = cpu;
+    cpuData->reported = reported;
+    cpuData->migratable = migratable;
+ }
+ 
+ 
+@@ -3307,26 +3319,39 @@ virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps,
+ }
+ 
+ 
+static virCPUDefPtr
+virQEMUCapsNewHostCPUModel(void)
+{
+    virCPUDefPtr cpu;
+
+    if (VIR_ALLOC(cpu) < 0)
+        return NULL;
+
+    cpu->type = VIR_CPU_TYPE_GUEST;
+    cpu->mode = VIR_CPU_MODE_CUSTOM;
+    cpu->match = VIR_CPU_MATCH_EXACT;
+    cpu->fallback = VIR_CPU_FALLBACK_ALLOW;
+
+    return cpu;
+}
+
+
+ void
+ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
+                             virCapsPtr caps,
+                             virDomainVirtType type)
+ {
+     virCPUDefPtr cpu = NULL;
+    virCPUDefPtr migCPU = NULL;
+     virCPUDefPtr hostCPU = NULL;
+     int rc;
+ 
+     if (!caps || !virQEMUCapsGuestIsNative(caps->host.arch, qemuCaps->arch))
+         return;
+ 
+-    if (VIR_ALLOC(cpu) < 0)
+    if (!(cpu = virQEMUCapsNewHostCPUModel()))
+         goto error;
+ 
+-    cpu->type = VIR_CPU_TYPE_GUEST;
+-    cpu->mode = VIR_CPU_MODE_CUSTOM;
+-    cpu->match = VIR_CPU_MATCH_EXACT;
+-    cpu->fallback = VIR_CPU_FALLBACK_ALLOW;
+-
+     if ((rc = virQEMUCapsInitCPUModel(qemuCaps, type, cpu, false)) < 0) {
+         goto error;
+     } else if (rc == 1) {
+@@ -3340,7 +3365,20 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
+             goto error;
+     }
+ 
+-    virQEMUCapsSetHostModel(qemuCaps, type, cpu);
+    if (!(migCPU = virQEMUCapsNewHostCPUModel()))
+        goto error;
+
+    if ((rc = virQEMUCapsInitCPUModel(qemuCaps, type, migCPU, true)) < 0) {
+        goto error;
+    } else if (rc == 1) {
+        VIR_DEBUG("CPU migratability not provided by QEMU");
+
+        virCPUDefFree(migCPU);
+        if (!(migCPU = virCPUCopyMigratable(qemuCaps->arch, cpu)))
+            goto error;
+    }
+
+    virQEMUCapsSetHostModel(qemuCaps, type, cpu, migCPU);
+ 
+  cleanup:
+     virCPUDefFree(hostCPU);
+@@ -3348,6 +3386,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
+ 
+  error:
+     virCPUDefFree(cpu);
+    virCPUDefFree(migCPU);
+     virResetLastError();
+     goto cleanup;
+ }
+diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
+index 88e27855b..31818c940 100644
+--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
+@@ -453,6 +453,8 @@ int virQEMUCapsGetCPUDefinitions(virQEMUCapsPtr qemuCaps,
+ typedef enum {
+     /* Host CPU definition reported in domain capabilities. */
+     VIR_QEMU_CAPS_HOST_CPU_REPORTED,
+    /* Migratable host CPU definition used for updating guest CPU. */
+    VIR_QEMU_CAPS_HOST_CPU_MIGRATABLE,
+ } virQEMUCapsHostCPUType;
+ 
+ virCPUDefPtr virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps,
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index 07a88a3a7..e67736638 100644
+--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
+@@ -5306,7 +5306,7 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def,
+ 
+     if (virCPUUpdate(def->os.arch, def->cpu,
+                      virQEMUCapsGetHostModel(qemuCaps, def->virtType,
+-                                             VIR_QEMU_CAPS_HOST_CPU_REPORTED)) < 0)
+                                             VIR_QEMU_CAPS_HOST_CPU_MIGRATABLE)) < 0)
+         goto cleanup;
+ 
+     if (virQEMUCapsGetCPUDefinitions(qemuCaps, def->virtType,
+diff --git a/tests/cputest.c b/tests/cputest.c
+index 8c07cf4f6..efa891dc1 100644
+--- a/tests/cputest.c
+++ b/tests/cputest.c
+@@ -393,6 +393,7 @@ cpuTestUpdate(const void *arg)
+     const struct data *data = arg;
+     int ret = -1;
+     virCPUDefPtr host = NULL;
+    virCPUDefPtr migHost = NULL;
+     virCPUDefPtr cpu = NULL;
+     char *result = NULL;
+ 
+@@ -400,7 +401,10 @@ cpuTestUpdate(const void *arg)
+         !(cpu = cpuTestLoadXML(data->arch, data->name)))
+         goto cleanup;
+ 
+-    if (virCPUUpdate(host->arch, cpu, host) < 0)
+    if (!(migHost = virCPUCopyMigratable(data->arch, host)))
+        goto cleanup;
+
+    if (virCPUUpdate(host->arch, cpu, migHost) < 0)
+         goto cleanup;
+ 
+     if (virAsprintf(&result, "%s+%s", data->host, data->name) < 0)
+@@ -411,6 +415,7 @@ cpuTestUpdate(const void *arg)
+  cleanup:
+     virCPUDefFree(host);
+     virCPUDefFree(cpu);
+    virCPUDefFree(migHost);
+     VIR_FREE(result);
+     return ret;
+ }
@@ -0,0 +1,49 @@
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Wed, 29 Mar 2017 15:00:21 +0200
+Subject: [PATCH] cpu: Drop feature filtering from virCPUUpdate
+
+Because of the changes done in the previous commit, @host is already a
+migratable CPU and there's no need to do any additional filtering.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit 232d87c7dd081d126a079fb45178e0be096cc680)
+---
+ src/cpu/cpu_x86.c | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index a771b251e..53359ff9b 100644
+--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
+@@ -2549,8 +2549,7 @@ x86Baseline(virCPUDefPtr *cpus,
+ 
+ static int
+ x86UpdateHostModel(virCPUDefPtr guest,
+-                   const virCPUDef *host,
+-                   virCPUx86MapPtr map)
+                   const virCPUDef *host)
+ {
+     virCPUDefPtr updated = NULL;
+     size_t i;
+@@ -2559,11 +2558,9 @@ x86UpdateHostModel(virCPUDefPtr guest,
+     if (!(updated = virCPUDefCopyWithoutModel(host)))
+         goto cleanup;
+ 
+-    /* Remove non-migratable features by default */
+     updated->type = VIR_CPU_TYPE_GUEST;
+     updated->mode = VIR_CPU_MODE_CUSTOM;
+-    if (virCPUDefCopyModelFilter(updated, host, true,
+-                                 x86FeatureIsMigratable, map) < 0)
+    if (virCPUDefCopyModel(updated, host, true) < 0)
+         goto cleanup;
+ 
+     if (guest->vendor_id) {
+@@ -2627,7 +2624,7 @@ virCPUx86Update(virCPUDefPtr guest,
+ 
+     if (guest->mode == VIR_CPU_MODE_HOST_MODEL ||
+         guest->match == VIR_CPU_MATCH_MINIMUM)
+-        ret = x86UpdateHostModel(guest, host, map);
+        ret = x86UpdateHostModel(guest, host);
+     else
+         ret = 0;
+ 
@@ -0,0 +1,74 @@
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 11 Apr 2017 20:45:07 +0200
+Subject: [PATCH] cpu: Introduce virCPUGetHostIsSupported
+
+Sometimes we want to call virCPUGetHost only when it is implemented for
+a given architecture to avoid logging expected and possibly misleading
+errors. The new virCPUGetHostIsSupported API may be used to guard such
+calls to virCPUGetHost.
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit bf1a881715c905c67f7d38dcd5bd6c2afbff1f9b)
+---
+ src/cpu/cpu.c            | 20 ++++++++++++++++++++
+ src/cpu/cpu.h            |  3 +++
+ src/libvirt_private.syms |  1 +
+ 3 files changed, 24 insertions(+)
+
+diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
+index 8a407ac18..702b14dbb 100644
+--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
+@@ -357,6 +357,26 @@ virCPUDataFree(virCPUDataPtr data)
+ }
+ 
+ 
+/**
+ * virCPUGetHostIsSupported:
+ *
+ * @arch: CPU architecture
+ *
+ * Check whether virCPUGetHost is supported for @arch.
+ *
+ * Returns true if virCPUGetHost is supported, false otherwise.
+ */
+bool
+virCPUGetHostIsSupported(virArch arch)
+{
+    struct cpuArchDriver *driver;
+
+    VIR_DEBUG("arch=%s", virArchToString(arch));
+
+    return (driver = cpuGetSubDriver(arch)) && driver->getHost;
+}
+
+
+ /**
+  * virCPUGetHost:
+  *
+diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
+index 352445c40..c6ca111e9 100644
+--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
+@@ -183,6 +183,9 @@ virCPUDataNew(virArch arch);
+ void
+ virCPUDataFree(virCPUDataPtr data);
+ 
+bool
+virCPUGetHostIsSupported(virArch arch);
+
+ virCPUDefPtr
+ virCPUGetHost(virArch arch,
+               virCPUType type,
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index dc6db3b28..2d8a9ddec 100644
+--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
+@@ -1024,6 +1024,7 @@ virCPUDataNew;
+ virCPUDataParse;
+ virCPUExpandFeatures;
+ virCPUGetHost;
+virCPUGetHostIsSupported;
+ virCPUGetModels;
+ virCPUProbeHost;
+ virCPUTranslate;
@@ -0,0 +1,164 @@
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 11 Apr 2017 20:46:05 +0200
+Subject: [PATCH] qemu: Use more data for comparing CPUs
+
+With QEMU older than 2.9.0 libvirt uses CPUID instruction to determine
+what CPU features are supported on the host. This was later used when
+checking compatibility of guest CPUs. Since QEMU 2.9.0 we ask QEMU for
+the host CPU data. But the two methods we use usually provide disjoint
+sets of CPU features because QEMU/KVM does not support all features
+provided by the host CPU and on the other hand it can enable some
+feature even if the host CPU does not support them.
+
+So if there is a domain which requires a CPU features disabled by
+QEMU/KVM, libvirt will refuse to start it with QEMU > 2.9.0 as its guest
+CPU is incompatible with the host CPU data we got from QEMU. But such
+domain would happily start on older QEMU (of course, the features would
+be missing the guest CPU). To fix this regression, we need to combine
+both CPU feature sets when checking guest CPU compatibility.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1439933
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit 5b4a6adb5ca24a6cb91cdc55c31506fb278d3a91)
+---
+ src/qemu/qemu_capabilities.c | 35 +++++++++++++++++++++++++++++++++--
+ src/qemu/qemu_capabilities.h |  4 ++++
+ src/qemu/qemu_process.c      |  2 +-
+ 3 files changed, 38 insertions(+), 3 deletions(-)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index 7fc577546..01bd4750c 100644
+--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
+@@ -386,6 +386,10 @@ struct _virQEMUCapsHostCPUData {
+     virCPUDefPtr reported;
+     /* Migratable host CPU definition used for updating guest CPU. */
+     virCPUDefPtr migratable;
+    /* CPU definition with features detected by libvirt using virCPUGetHost
+     * combined with features reported by QEMU. This is used for backward
+     * compatible comparison between a guest CPU and a host CPU. */
+    virCPUDefPtr full;
+ };
+ 
+ /*
+@@ -2106,6 +2110,10 @@ virQEMUCapsHostCPUDataCopy(virQEMUCapsHostCPUDataPtr dst,
+         !(dst->migratable = virCPUDefCopy(src->migratable)))
+         return -1;
+ 
+    if (src->full &&
+        !(dst->full = virCPUDefCopy(src->full)))
+        return -1;
+
+     return 0;
+ }
+ 
+@@ -2116,6 +2124,7 @@ virQEMUCapsHostCPUDataClear(virQEMUCapsHostCPUDataPtr cpuData)
+     qemuMonitorCPUModelInfoFree(cpuData->info);
+     virCPUDefFree(cpuData->reported);
+     virCPUDefFree(cpuData->migratable);
+    virCPUDefFree(cpuData->full);
+ 
+     memset(cpuData, 0, sizeof(*cpuData));
+ }
+@@ -2457,6 +2466,11 @@ virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps,
+ 
+     case VIR_QEMU_CAPS_HOST_CPU_MIGRATABLE:
+         return cpuData->migratable;
+
+    case VIR_QEMU_CAPS_HOST_CPU_FULL:
+        /* 'full' is non-NULL only if we have data from both QEMU and
+         * virCPUGetHost */
+        return cpuData->full ? cpuData->full : cpuData->reported;
+     }
+ 
+     return NULL;
+@@ -2467,12 +2481,14 @@ static void
+ virQEMUCapsSetHostModel(virQEMUCapsPtr qemuCaps,
+                         virDomainVirtType type,
+                         virCPUDefPtr reported,
+-                        virCPUDefPtr migratable)
+                        virCPUDefPtr migratable,
+                        virCPUDefPtr full)
+ {
+     virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type);
+ 
+     cpuData->reported = reported;
+     cpuData->migratable = migratable;
+    cpuData->full = full;
+ }
+ 
+ 
+@@ -3344,6 +3360,8 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
+     virCPUDefPtr cpu = NULL;
+     virCPUDefPtr migCPU = NULL;
+     virCPUDefPtr hostCPU = NULL;
+    virCPUDefPtr fullCPU = NULL;
+    size_t i;
+     int rc;
+ 
+     if (!caps || !virQEMUCapsGuestIsNative(caps->host.arch, qemuCaps->arch))
+@@ -3363,6 +3381,18 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
+                                      virQEMUCapsCPUFilterFeatures,
+                                      qemuCaps) < 0)
+             goto error;
+    } else if (type == VIR_DOMAIN_VIRT_KVM &&
+               virCPUGetHostIsSupported(qemuCaps->arch)) {
+        if (!(fullCPU = virCPUGetHost(qemuCaps->arch, VIR_CPU_TYPE_GUEST,
+                                      NULL, NULL, 0)))
+            goto error;
+
+        for (i = 0; i < cpu->nfeatures; i++) {
+            if (cpu->features[i].policy == VIR_CPU_FEATURE_REQUIRE &&
+                virCPUDefUpdateFeature(fullCPU, cpu->features[i].name,
+                                       VIR_CPU_FEATURE_REQUIRE) < 0)
+                goto error;
+        }
+     }
+ 
+     if (!(migCPU = virQEMUCapsNewHostCPUModel()))
+@@ -3378,7 +3408,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
+             goto error;
+     }
+ 
+-    virQEMUCapsSetHostModel(qemuCaps, type, cpu, migCPU);
+    virQEMUCapsSetHostModel(qemuCaps, type, cpu, migCPU, fullCPU);
+ 
+  cleanup:
+     virCPUDefFree(hostCPU);
+@@ -3387,6 +3417,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
+  error:
+     virCPUDefFree(cpu);
+     virCPUDefFree(migCPU);
+    virCPUDefFree(fullCPU);
+     virResetLastError();
+     goto cleanup;
+ }
+diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
+index 31818c940..4e9561c0a 100644
+--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
+@@ -455,6 +455,10 @@ typedef enum {
+     VIR_QEMU_CAPS_HOST_CPU_REPORTED,
+     /* Migratable host CPU definition used for updating guest CPU. */
+     VIR_QEMU_CAPS_HOST_CPU_MIGRATABLE,
+    /* CPU definition with features detected by libvirt using virCPUGetHost
+     * combined with features reported by QEMU. This is used for backward
+     * compatible comparison between a guest CPU and a host CPU. */
+    VIR_QEMU_CAPS_HOST_CPU_FULL,
+ } virQEMUCapsHostCPUType;
+ 
+ virCPUDefPtr virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps,
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index e67736638..992a7174b 100644
+--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
+@@ -5300,7 +5300,7 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def,
+     if (def->cpu->check == VIR_CPU_CHECK_PARTIAL &&
+         virCPUCompare(caps->host.arch,
+                       virQEMUCapsGetHostModel(qemuCaps, def->virtType,
+-                                              VIR_QEMU_CAPS_HOST_CPU_REPORTED),
+                                              VIR_QEMU_CAPS_HOST_CPU_FULL),
+                       def->cpu, true) < 0)
+         return -1;
+ 
@@ -0,0 +1,123 @@
+From: Neal Gompa <ngompa13@gmail.com>
+Date: Mon, 17 Jul 2017 11:32:46 -0400
+Subject: [PATCH] spec: Add support for building the zfs storage driver
+
+Where it can be supported in Fedora, the driver is built and made
+available as a subpackage.
+
+Signed-off-by: Neal Gompa <ngompa13@gmail.com>
+(cherry picked from commit 9af764e86aef7dfb0191a9561bf1d1abf941da05)
+---
+ libvirt.spec.in | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 49 insertions(+), 1 deletion(-)
+
+diff --git a/libvirt.spec.in b/libvirt.spec.in
+index 079b5f386..46a3e97d1 100644
+--- a/libvirt.spec.in
+++ b/libvirt.spec.in
+@@ -71,6 +71,13 @@
+ %define with_storage_gluster 0%{!?_without_storage_gluster:1}
+ %define with_numactl          0%{!?_without_numactl:1}
+ 
+# F25+ has zfs-fuse
+%if 0%{?fedora} >= 25
+    %define with_storage_zfs      0%{!?_without_storage_zfs:1}
+%else
+    %define with_storage_zfs      0
+%endif
+
+ # A few optional bits off by default, we enable later
+ %define with_fuse          0%{!?_without_fuse:0}
+ %define with_cgconfig      0%{!?_without_cgconfig:0}
+@@ -115,6 +122,12 @@
+     %endif
+ %endif
+ 
+# zfs-fuse is not available on some architectures
+%ifarch s390 s390x aarch64
+    %define with_storage_zfs 0
+%endif
+
+
+ # RHEL doesn't ship OpenVZ, VBox, UML, PowerHypervisor,
+ # VMware, libxenserver (xenapi), libxenlight (Xen 4.1 and newer),
+ # or HyperV.
+@@ -373,6 +386,12 @@ BuildRequires: glusterfs-devel >= 3.4.1
+ %if %{with_storage_sheepdog}
+ BuildRequires: sheepdog
+ %endif
+%if %{with_storage_zfs}
+# Support any conforming implementation of zfs. On stock Fedora
+# this is zfs-fuse, but could be zfsonlinux upstream RPMs
+BuildRequires: /sbin/zfs
+BuildRequires: /sbin/zpool
+%endif
+ %if %{with_numactl}
+ # For QEMU/LXC numa info
+ BuildRequires: numactl-devel
+@@ -705,6 +724,21 @@ sheepdog volumes using.
+ %endif
+ 
+ 
+%if %{with_storage_zfs}
+%package daemon-driver-storage-zfs
+Summary: Storage driver plugin for ZFS
+Group: Development/Libraries
+Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
+# Support any conforming implementation of zfs
+Requires: /sbin/zfs
+Requires: /sbin/zpool
+
+%description daemon-driver-storage-zfs
+The storage driver backend adding implementation of the storage APIs for
+ZFS volumes.
+%endif
+
+
+ %package daemon-driver-storage
+ Summary: Storage driver plugin including all backends for the libvirtd daemon
+ Group: Development/Libraries
+@@ -723,6 +757,9 @@ Requires: libvirt-daemon-driver-storage-rbd = %{version}-%{release}
+ %if %{with_storage_sheepdog}
+ Requires: libvirt-daemon-driver-storage-sheepdog = %{version}-%{release}
+ %endif
+%if %{with_storage_zfs}
+Requires: libvirt-daemon-driver-storage-zfs = %{version}-%{release}
+%endif
+ 
+ %description daemon-driver-storage
+ The storage driver plugin for the libvirtd daemon, providing
+@@ -1180,6 +1217,12 @@ rm -rf .git
+     %define arg_storage_gluster --without-storage-gluster
+ %endif
+ 
+%if %{with_storage_zfs}
+    %define arg_storage_zfs --with-storage-zfs
+%else
+    %define arg_storage_zfs --without-storage-zfs
+%endif
+
+ %if %{with_numactl}
+     %define arg_numactl --with-numactl
+ %else
+@@ -1288,7 +1331,7 @@ rm -f po/stamp-po
+            %{?arg_storage_rbd} \
+            %{?arg_storage_sheepdog} \
+            %{?arg_storage_gluster} \
+-           --without-storage-zfs \
+           %{?arg_storage_zfs} \
+            --without-storage-vstorage \
+            %{?arg_numactl} \
+            %{?arg_numad} \
+@@ -1850,6 +1893,11 @@ exit 0
+ %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_sheepdog.so
+ %endif
+ 
+%if %{with_storage_zfs}
+%files daemon-driver-storage-zfs
+%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_zfs.so
+%endif
+
+ %if %{with_qemu}
+ %files daemon-driver-qemu
+ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
@@ -0,0 +1,150 @@
+From: Juan Hernandez <jhernand@redhat.com>
+Date: Thu, 6 Jul 2017 17:03:31 +0200
+Subject: [PATCH] Avoid hidden cgroup mount points
+
+Currently the scan of the /proc/mounts file used to find cgroup mount
+points doesn't take into account that mount points may hidden by other
+mount points. For, example in certain Kubernetes environments the
+/proc/mounts contains the following lines:
+
+  cgroup /sys/fs/cgroup/net_prio,net_cls cgroup ...
+  tmpfs /sys/fs/cgroup tmpfs ...
+  cgroup /sys/fs/cgroup/net_cls,net_prio cgroup ...
+
+In this particular environment the first mount point is hidden by the
+second one. The correct mount point is the third one, but libvirt will
+never process it because it only checks the first mount point for each
+controller (net_cls in this case). So libvirt will try to use the first
+mount point, which doesn't actually exist, and the complete detection
+process will fail.
+
+To avoid that issue this patch changes the virCgroupDetectMountsFromFile
+function so that when there are duplicates it takes the information from
+the last line in /proc/mounts. This requires removing the previous
+explicit condition to skip duplicates, and adding code to free the
+memory used by the processing of duplicated lines.
+
+Related-To: https://bugzilla.redhat.com/1468214
+Related-To: https://github.com/kubevirt/libvirt/issues/4
+Signed-off-by: Juan Hernandez <jhernand@redhat.com>
+(cherry picked from commit dacd160d7479e0ec2d8a63f102145fd30636a1c8)
+---
+ src/util/vircgroup.c                | 23 ++++++++++++++---------
+ tests/vircgroupdata/kubevirt.mounts | 25 +++++++++++++++++++++++++
+ tests/vircgroupdata/kubevirt.parsed | 10 ++++++++++
+ tests/vircgrouptest.c               |  1 +
+ 4 files changed, 50 insertions(+), 9 deletions(-)
+ create mode 100644 tests/vircgroupdata/kubevirt.mounts
+ create mode 100644 tests/vircgroupdata/kubevirt.parsed
+
+diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
+index 5aa1db5b1..a53908fc9 100644
+--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
+@@ -397,6 +397,7 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
+             const char *typestr = virCgroupControllerTypeToString(i);
+             int typelen = strlen(typestr);
+             char *tmp = entry.mnt_opts;
+            struct virCgroupController *controller = &group->controllers[i];
+             while (tmp) {
+                 char *next = strchr(tmp, ',');
+                 int len;
+@@ -406,18 +407,22 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
+                 } else {
+                     len = strlen(tmp);
+                 }
+-                /* NB, the same controller can appear >1 time in mount list
+-                 * due to bind mounts from one location to another. Pick the
+-                 * first entry only
+-                 */
+-                if (typelen == len && STREQLEN(typestr, tmp, len) &&
+-                    !group->controllers[i].mountPoint) {
+
+                if (typelen == len && STREQLEN(typestr, tmp, len)) {
+                     char *linksrc;
+                     struct stat sb;
+                     char *tmp2;
+ 
+-                    if (VIR_STRDUP(group->controllers[i].mountPoint,
+-                                   entry.mnt_dir) < 0)
+                    /* Note that the lines in /proc/mounts have the same
+                     * order than the mount operations, and that there may
+                     * be duplicates due to bind mounts. This means
+                     * that the same mount point may be processed more than
+                     * once. We need to save the results of the last one,
+                     * and we need to be careful to release the memory used
+                     * by previous processing. */
+                    VIR_FREE(controller->mountPoint);
+                    VIR_FREE(controller->linkPoint);
+                    if (VIR_STRDUP(controller->mountPoint, entry.mnt_dir) < 0)
+                         goto error;
+ 
+                     tmp2 = strrchr(entry.mnt_dir, '/');
+@@ -453,7 +458,7 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
+                                 VIR_WARN("Expecting a symlink at %s for controller %s",
+                                          linksrc, typestr);
+                             } else {
+-                                group->controllers[i].linkPoint = linksrc;
+                                controller->linkPoint = linksrc;
+                             }
+                         }
+                     }
+diff --git a/tests/vircgroupdata/kubevirt.mounts b/tests/vircgroupdata/kubevirt.mounts
+new file mode 100644
+index 000000000..ca036196b
+--- /dev/null
+++ b/tests/vircgroupdata/kubevirt.mounts
+@@ -0,0 +1,25 @@
+rootfs / rootfs rw 0 0
+proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0
+udev /dev devtmpfs rw,nosuid,relatime,size=10240k,nr_inodes=1006404,mode=755 0 0
+devpts /dev/pts devpts rw,relatime,gid=5,mode=620,ptmxmode=000 0 0
+sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0
+/dev/sda1 / ext4 rw,noatime,data=ordered 0 0
+tmpfs /run tmpfs rw,nodev,relatime,size=812296k,mode=755 0 0
+mqueue /dev/mqueue mqueue rw,nosuid,nodev,noexec,relatime 0 0
+shm /dev/shm tmpfs rw,nosuid,nodev,noexec,relatime 0 0
+debugfs /sys/kernel/debug debugfs rw,nosuid,nodev,noexec,relatime 0 0
+cgroup_root /sys/fs/cgroup tmpfs rw,nosuid,nodev,noexec,relatime,size=10240k,mode=755 0 0
+openrc /sys/fs/cgroup/openrc cgroup rw,nosuid,nodev,noexec,relatime,release_agent=/lib64/rc/sh/cgroup-release-agent.sh,name=openrc 0 0
+cpuset /some/random/location/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0
+cpuset /sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0
+cpu /sys/fs/cgroup/cpu cgroup rw,nosuid,nodev,noexec,relatime,cpu 0 0
+cpuacct /some/random/location/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuacct 0 0
+cpuacct /sys/fs/cgroup/cpuacct cgroup rw,nosuid,nodev,noexec,relatime,cpuacct 0 0
+memory /sys/fs/cgroup/memory cgroup rw,nosuid,nodev,noexec,relatime,memory 0 0
+devices /sys/fs/cgroup/devices cgroup rw,nosuid,nodev,noexec,relatime,devices 0 0
+freezer /sys/fs/cgroup/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0
+blkio /sys/fs/cgroup/blkio cgroup rw,nosuid,nodev,noexec,relatime,blkio 0 0
+perf_event /sys/fs/cgroup/perf_event cgroup rw,nosuid,nodev,noexec,relatime,perf_event 0 0
+hugetlb /sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 0
+binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc rw,nosuid,nodev,noexec,relatime 0 0
+freezer /some/random/location/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0
+diff --git a/tests/vircgroupdata/kubevirt.parsed b/tests/vircgroupdata/kubevirt.parsed
+new file mode 100644
+index 000000000..694870723
+--- /dev/null
+++ b/tests/vircgroupdata/kubevirt.parsed
+@@ -0,0 +1,10 @@
+cpu          /sys/fs/cgroup/cpu
+cpuacct      /sys/fs/cgroup/cpuacct
+cpuset       /sys/fs/cgroup/cpuset
+memory       /sys/fs/cgroup/memory
+devices      /sys/fs/cgroup/devices
+freezer      /some/random/location/freezer
+blkio        /sys/fs/cgroup/blkio
+net_cls      <null>
+perf_event   /sys/fs/cgroup/perf_event
+name=systemd <null>
+diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
+index f55ef74a1..cf0315f16 100644
+--- a/tests/vircgrouptest.c
+++ b/tests/vircgrouptest.c
+@@ -885,6 +885,7 @@ mymain(void)
+     DETECT_MOUNTS("cgroups3");
+     DETECT_MOUNTS("all-in-one");
+     DETECT_MOUNTS("no-cgroups");
+    DETECT_MOUNTS("kubevirt");
+ 
+     if (virTestRun("New cgroup for self", testCgroupNewForSelf, NULL) < 0)
+         ret = -1;
@@ -0,0 +1,53 @@
+From: Jim Fehlig <jfehlig@suse.com>
+Date: Tue, 18 Jul 2017 10:20:35 -0600
+Subject: [PATCH] docs: schema: make disk driver name attribute optional
+
+/domain/devices/disk/driver/@name is not a required or mandatory
+attribute according to formatdomain, and indeed it was agreed on
+IRC that the attribute is "optional for input, recommended (but
+not required) for output". Currently the schema requires the
+attribute, causing virt-xml-validate to fail on disk config where
+the driver name is not explicitly specified. E.g.
+
+# cat test.xml | grep -A 5 cdrom
+    <disk type='file' device='cdrom'>
+      <driver type='raw'/>
+      <target dev='hdb' bus='ide'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
+    </disk>
+
+# virt-xml-validate test.xml
+Relax-NG validity error : Extra element devices in interleave
+test.xml:21: element devices: Relax-NG validity error : Element domain failed to validate content
+test.xml fails to validate
+
+Relaxing the name attribute to be optional fixes the validation
+
+# virt-xml-validate test.xml
+test.xml validates
+
+(cherry picked from commit b494e09d058f09b48d0fd8855edd557101294671)
+---
+ docs/schemas/domaincommon.rng | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
+index edc225fe5..dfc7e2470 100644
+--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
+@@ -1720,9 +1720,11 @@
+     </element>
+   </define>
+   <define name="driverFormat">
+-    <attribute name="name">
+-      <ref name="genericName"/>
+-    </attribute>
+    <optional>
+      <attribute name="name">
+        <ref name="genericName"/>
+      </attribute>
+    </optional>
+     <optional>
+       <attribute name='type'>
+         <choice>
@@ -0,0 +1,34 @@
+From: Stefan Berger <stefanb@linux.vnet.ibm.com>
+Date: Thu, 29 Jun 2017 14:01:11 -0400
+Subject: [PATCH] tpm: Use /dev/null for cancel path if none was found
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+TPM 2 does not implement sysfs files for cancellation of commands.
+We therefore use /dev/null for the cancel path passed to QEMU.
+
+Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
+Tested-by: Javier Martinez Canillas <javierm@redhat.com>
+Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit dfbb15b75433e520fb1b905c1c3e28753e53e4a5)
+---
+ src/util/virtpm.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/util/virtpm.c b/src/util/virtpm.c
+index 6d9b0657a..d5c10da38 100644
+--- a/src/util/virtpm.c
+++ b/src/util/virtpm.c
+@@ -61,9 +61,7 @@ virTPMCreateCancelPath(const char *devpath)
+                 VIR_FREE(path);
+             }
+             if (!path)
+-                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+-                               _("No usable sysfs TPM cancel file could be "
+-                                 "found"));
+                ignore_value(VIR_STRDUP(path, "/dev/null"));
+         } else {
+             virReportError(VIR_ERR_INTERNAL_ERROR,
+                            _("TPM device path %s is invalid"), devpath);
@@ -0,0 +1,108 @@
+From: Cole Robinson <crobinso@redhat.com>
+Date: Sun, 27 Aug 2017 11:23:47 -0400
+Subject: [PATCH] security: add MANAGER_MOUNT_NAMESPACE flag
+
+The VIR_SECURITY_MANAGER_MOUNT_NAMESPACE flag informs the DAC driver
+if mount namespaces are in use for the VM. Will be used for future
+changes.
+
+Wire it up in the qemu driver
+
+(cherry picked from commit 321031e482425dfeae0f125cdac6df870f079efd)
+---
+ src/qemu/qemu_driver.c          |  2 ++
+ src/security/security_dac.c     | 10 ++++++++++
+ src/security/security_dac.h     |  3 +++
+ src/security/security_manager.c |  4 +++-
+ src/security/security_manager.h |  1 +
+ 5 files changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index ce844bb04..555a1009b 100644
+--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
+@@ -417,6 +417,8 @@ qemuSecurityInit(virQEMUDriverPtr driver)
+     if (virQEMUDriverIsPrivileged(driver)) {
+         if (cfg->dynamicOwnership)
+             flags |= VIR_SECURITY_MANAGER_DYNAMIC_OWNERSHIP;
+        if (virBitmapIsBitSet(cfg->namespaces, QEMU_DOMAIN_NS_MOUNT))
+            flags |= VIR_SECURITY_MANAGER_MOUNT_NAMESPACE;
+         if (!(mgr = qemuSecurityNewDAC(QEMU_DRIVER_NAME,
+                                        cfg->user,
+                                        cfg->group,
+diff --git a/src/security/security_dac.c b/src/security/security_dac.c
+index 922e48494..1f8d279bf 100644
+--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
+@@ -57,6 +57,7 @@ struct _virSecurityDACData {
+     gid_t *groups;
+     int ngroups;
+     bool dynamicOwnership;
+    bool mountNamespace;
+     char *baselabel;
+     virSecurityManagerDACChownCallback chownCallback;
+ };
+@@ -237,6 +238,15 @@ virSecurityDACSetDynamicOwnership(virSecurityManagerPtr mgr,
+     priv->dynamicOwnership = dynamicOwnership;
+ }
+ 
+void
+virSecurityDACSetMountNamespace(virSecurityManagerPtr mgr,
+                                bool mountNamespace)
+{
+    virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
+    priv->mountNamespace = mountNamespace;
+}
+
+
+ void
+ virSecurityDACSetChownCallback(virSecurityManagerPtr mgr,
+                                virSecurityManagerDACChownCallback chownCallback)
+diff --git a/src/security/security_dac.h b/src/security/security_dac.h
+index 846cefbb5..97681c961 100644
+--- a/src/security/security_dac.h
+++ b/src/security/security_dac.h
+@@ -32,6 +32,9 @@ int virSecurityDACSetUserAndGroup(virSecurityManagerPtr mgr,
+ void virSecurityDACSetDynamicOwnership(virSecurityManagerPtr mgr,
+                                        bool dynamic);
+ 
+void virSecurityDACSetMountNamespace(virSecurityManagerPtr mgr,
+                                     bool mountNamespace);
+
+ void virSecurityDACSetChownCallback(virSecurityManagerPtr mgr,
+                                     virSecurityManagerDACChownCallback chownCallback);
+ 
+diff --git a/src/security/security_manager.c b/src/security/security_manager.c
+index 6c777db1e..b2d04d4b9 100644
+--- a/src/security/security_manager.c
+++ b/src/security/security_manager.c
+@@ -146,7 +146,8 @@ virSecurityManagerNewDAC(const char *virtDriver,
+     virSecurityManagerPtr mgr;
+ 
+     virCheckFlags(VIR_SECURITY_MANAGER_NEW_MASK |
+-                  VIR_SECURITY_MANAGER_DYNAMIC_OWNERSHIP, NULL);
+                  VIR_SECURITY_MANAGER_DYNAMIC_OWNERSHIP |
+                  VIR_SECURITY_MANAGER_MOUNT_NAMESPACE, NULL);
+ 
+     mgr = virSecurityManagerNewDriver(&virSecurityDriverDAC,
+                                       virtDriver,
+@@ -161,6 +162,7 @@ virSecurityManagerNewDAC(const char *virtDriver,
+     }
+ 
+     virSecurityDACSetDynamicOwnership(mgr, flags & VIR_SECURITY_MANAGER_DYNAMIC_OWNERSHIP);
+    virSecurityDACSetMountNamespace(mgr, flags & VIR_SECURITY_MANAGER_MOUNT_NAMESPACE);
+     virSecurityDACSetChownCallback(mgr, chownCallback);
+ 
+     return mgr;
+diff --git a/src/security/security_manager.h b/src/security/security_manager.h
+index 238e66cd0..96937a892 100644
+--- a/src/security/security_manager.h
+++ b/src/security/security_manager.h
+@@ -36,6 +36,7 @@ typedef enum {
+     VIR_SECURITY_MANAGER_REQUIRE_CONFINED   = 1 << 2,
+     VIR_SECURITY_MANAGER_PRIVILEGED         = 1 << 3,
+     VIR_SECURITY_MANAGER_DYNAMIC_OWNERSHIP  = 1 << 4,
+    VIR_SECURITY_MANAGER_MOUNT_NAMESPACE    = 1 << 5,
+ } virSecurityManagerNewFlags;
+ 
+ # define VIR_SECURITY_MANAGER_NEW_MASK  \
@@ -0,0 +1,101 @@
+From: Cole Robinson <crobinso@redhat.com>
+Date: Mon, 17 Jul 2017 08:57:57 -0400
+Subject: [PATCH] security: dac: relabel spice rendernode
+
+For a logged in user this a path like /dev/dri/renderD128 will have
+default ownership root:video which won't work for the qemu:qemu user,
+so we need to chown it.
+
+We only do this when mount namespaces are enabled in the qemu driver,
+so the chown'ing doesn't interfere with other users of the shared
+render node path
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1460804
+(cherry picked from commit 98931187eefdec6f2dea5cb82ab6d23a3ffa6634)
+---
+ src/security/security_dac.c | 58 +++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 58 insertions(+)
+
+diff --git a/src/security/security_dac.c b/src/security/security_dac.c
+index 1f8d279bf..5f13bcee8 100644
+--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
+@@ -1379,6 +1379,54 @@ virSecurityDACRestoreTPMFileLabel(virSecurityManagerPtr mgr,
+ }
+ 
+ 
+static int
+virSecurityDACSetGraphicsLabel(virSecurityManagerPtr mgr,
+                               virDomainDefPtr def,
+                               virDomainGraphicsDefPtr gfx)
+
+{
+    virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
+    virSecurityLabelDefPtr seclabel;
+    uid_t user;
+    gid_t group;
+
+    /* Skip chowning the shared render file if namespaces are disabled */
+    if (!priv->mountNamespace)
+        return 0;
+
+    seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME);
+    if (seclabel && !seclabel->relabel)
+        return 0;
+
+    if (virSecurityDACGetIds(seclabel, priv, &user, &group, NULL, NULL) < 0)
+        return -1;
+
+    if (gfx->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE &&
+        gfx->data.spice.gl == VIR_TRISTATE_BOOL_YES &&
+        gfx->data.spice.rendernode) {
+        if (virSecurityDACSetOwnership(priv, NULL,
+                                       gfx->data.spice.rendernode,
+                                       user, group) < 0)
+            return -1;
+    }
+
+    return 0;
+}
+
+
+static int
+virSecurityDACRestoreGraphicsLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED,
+                               virDomainDefPtr def ATTRIBUTE_UNUSED,
+                               virDomainGraphicsDefPtr gfx ATTRIBUTE_UNUSED)
+
+{
+    /* The only graphics labelling we do is dependent on mountNamespaces,
+       in which case 'restoring' the label doesn't actually accomplish
+       anything, so there's nothing to do here */
+    return 0;
+}
+
+
+ static int
+ virSecurityDACSetInputLabel(virSecurityManagerPtr mgr,
+                             virDomainDefPtr def,
+@@ -1489,6 +1537,11 @@ virSecurityDACRestoreAllLabel(virSecurityManagerPtr mgr,
+             rc = -1;
+     }
+ 
+    for (i = 0; i < def->ngraphics; i++) {
+        if (virSecurityDACRestoreGraphicsLabel(mgr, def, def->graphics[i]) < 0)
+            return -1;
+    }
+
+     for (i = 0; i < def->ninputs; i++) {
+         if (virSecurityDACRestoreInputLabel(mgr, def, def->inputs[i]) < 0)
+             rc = -1;
+@@ -1602,6 +1655,11 @@ virSecurityDACSetAllLabel(virSecurityManagerPtr mgr,
+             return -1;
+     }
+ 
+    for (i = 0; i < def->ngraphics; i++) {
+        if (virSecurityDACSetGraphicsLabel(mgr, def, def->graphics[i]) < 0)
+            return -1;
+    }
+
+     for (i = 0; i < def->ninputs; i++) {
+         if (virSecurityDACSetInputLabel(mgr, def, def->inputs[i]) < 0)
+             return -1;
@@ -0,0 +1,63 @@
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Mon, 31 Jul 2017 16:55:58 +0200
+Subject: [PATCH] qemu: Honour <on_reboot/>
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1476866
+
+For some reason, we completely ignore <on_reboot/> setting for
+domains. The implementation is simply not there. It never was.
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 3ee9bdbe351c0b80d4c469571ef31df3f1b148ea)
+---
+ src/qemu/qemu_process.c | 27 ++++++++++++++++++++++++---
+ 1 file changed, 24 insertions(+), 3 deletions(-)
+
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index 992a7174b..7588212ba 100644
+--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
+@@ -487,6 +487,7 @@ qemuProcessHandleReset(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
+     virObjectEventPtr event;
+     qemuDomainObjPrivatePtr priv;
+     virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
+    int ret = -1;
+ 
+     virObjectLock(vm);
+ 
+@@ -498,12 +499,32 @@ qemuProcessHandleReset(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
+     if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0)
+         VIR_WARN("Failed to save status on vm %s", vm->def->name);
+ 
+-    virObjectUnlock(vm);
+    if (vm->def->onReboot == VIR_DOMAIN_LIFECYCLE_DESTROY ||
+        vm->def->onReboot == VIR_DOMAIN_LIFECYCLE_PRESERVE) {
+ 
+-    qemuDomainEventQueue(driver, event);
+        if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
+            goto cleanup;
+
+        if (!virDomainObjIsActive(vm)) {
+            VIR_DEBUG("Ignoring RESET event from inactive domain %s",
+                      vm->def->name);
+            goto endjob;
+        }
+
+        qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED,
+                        QEMU_ASYNC_JOB_NONE, 0);
+        virDomainAuditStop(vm, "destroyed");
+        qemuDomainRemoveInactive(driver, vm);
+     endjob:
+        qemuDomainObjEndJob(driver, vm);
+    }
+ 
+    ret = 0;
+ cleanup:
+    virObjectUnlock(vm);
+    qemuDomainEventQueue(driver, event);
+     virObjectUnref(cfg);
+-    return 0;
+    return ret;
+ }
+ 
+ 
@@ -0,0 +1,113 @@
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Thu, 27 Apr 2017 16:29:21 +0200
+Subject: [PATCH] qemuDomainBuildNamespace: Move /dev/* mountpoints later
+
+When setting up mount namespace for a qemu domain the following
+steps are executed:
+
+1) get list of mountpoints under /dev/
+2) move them to /var/run/libvirt/qemu/$domName.ext
+3) start constructing new device tree under /var/run/libvirt/qemu/$domName.dev
+4) move the mountpoint of the new device tree to /dev
+5) restore original mountpoints from step 2)
+
+Note the problem with this approach is that if some device in step
+3) requires access to a mountpoint from step 2) it will fail as
+the mountpoint is not there anymore. For instance consider the
+following domain disk configuration:
+
+    <disk type='file' device='disk'>
+      <driver name='qemu' type='raw'/>
+      <source file='/dev/shm/vhostmd0'/>
+      <target dev='vdb' bus='virtio'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/>
+    </disk>
+
+In this case operation fails as we are unable to create vhostmd0
+in the new device tree because after step 2) there is no /dev/shm
+anymore. Leave aside fact that we shouldn't try to create devices
+living in other mountpoints. That's a separate bug that will be
+addressed later.
+
+Currently, the order described above is rearranged to:
+
+1) get list of mountpoints under /dev/
+2) start constructing new device tree under /var/run/libvirt/qemu/$domName.dev
+3) move them to /var/run/libvirt/qemu/$domName.ext
+4) move the mountpoint of the new device tree to /dev
+5) restore original mountpoints from step 3)
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Cedric Bosdonnat <cbosdonnat@suse.com>
+(cherry picked from commit a7cc039dc796f541793955598377807af48341fb)
+(cherry picked from commit 469bf7cb7a44a0798c63e4b5e4682d8e38bce66e)
+---
+ src/qemu/qemu_domain.c | 48 ++++++++++++++++++++++++------------------------
+ 1 file changed, 24 insertions(+), 24 deletions(-)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 4a127cedf..64f18f493 100644
+--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
+@@ -7854,6 +7854,30 @@ qemuDomainBuildNamespace(virQEMUDriverConfigPtr cfg,
+     if (qemuDomainSetupDev(cfg, mgr, vm, devPath) < 0)
+         goto cleanup;
+ 
+    if (qemuDomainSetupAllDisks(cfg, vm, devPath) < 0)
+        goto cleanup;
+
+    if (qemuDomainSetupAllHostdevs(cfg, vm, devPath) < 0)
+        goto cleanup;
+
+    if (qemuDomainSetupAllMemories(cfg, vm, devPath) < 0)
+        goto cleanup;
+
+    if (qemuDomainSetupAllChardevs(cfg, vm, devPath) < 0)
+        goto cleanup;
+
+    if (qemuDomainSetupTPM(cfg, vm, devPath) < 0)
+        goto cleanup;
+
+    if (qemuDomainSetupAllGraphics(cfg, vm, devPath) < 0)
+        goto cleanup;
+
+    if (qemuDomainSetupAllInputs(cfg, vm, devPath) < 0)
+        goto cleanup;
+
+    if (qemuDomainSetupAllRNGs(cfg, vm, devPath) < 0)
+        goto cleanup;
+
+     /* Save some mount points because we want to share them with the host */
+     for (i = 0; i < ndevMountsPath; i++) {
+         struct stat sb;
+@@ -7881,30 +7905,6 @@ qemuDomainBuildNamespace(virQEMUDriverConfigPtr cfg,
+             goto cleanup;
+     }
+ 
+-    if (qemuDomainSetupAllDisks(cfg, vm, devPath) < 0)
+-        goto cleanup;
+-
+-    if (qemuDomainSetupAllHostdevs(cfg, vm, devPath) < 0)
+-        goto cleanup;
+-
+-    if (qemuDomainSetupAllMemories(cfg, vm, devPath) < 0)
+-        goto cleanup;
+-
+-    if (qemuDomainSetupAllChardevs(cfg, vm, devPath) < 0)
+-        goto cleanup;
+-
+-    if (qemuDomainSetupTPM(cfg, vm, devPath) < 0)
+-        goto cleanup;
+-
+-    if (qemuDomainSetupAllGraphics(cfg, vm, devPath) < 0)
+-        goto cleanup;
+-
+-    if (qemuDomainSetupAllInputs(cfg, vm, devPath) < 0)
+-        goto cleanup;
+-
+-    if (qemuDomainSetupAllRNGs(cfg, vm, devPath) < 0)
+-        goto cleanup;
+-
+     if (virFileMoveMount(devPath, "/dev") < 0)
+         goto cleanup;
+ 
@@ -0,0 +1,71 @@
+From: "Daniel P. Berrange" <berrange@redhat.com>
+Date: Thu, 5 Oct 2017 17:54:28 +0100
+Subject: [PATCH] qemu: ensure TLS clients always verify the server certificate
+
+The default_tls_x509_verify (and related) parameters in qemu.conf
+control whether the QEMU TLS servers request & verify certificates
+from clients. This works as a simple access control system for
+servers by requiring the CA to issue certs to permitted clients.
+This use of client certificates is disabled by default, since it
+requires extra work to issue client certificates.
+
+Unfortunately the code was using this configuration parameter when
+setting up both TLS clients and servers in QEMU. The result was that
+TLS clients for character devices and disk devices had verification
+turned off, meaning they would ignore errors while validating the
+server certificate.
+
+This allows for trivial MITM attacks between client and server,
+as any certificate returned by the attacker will be accepted by
+the client.
+
+This is assigned CVE-2017-1000256  / LSN-2017-0002
+
+Reviewed-by: Eric Blake <eblake@redhat.com>
+Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
+(cherry picked from commit 441d3eb6d1be940a67ce45a286602a967601b157)
+---
+ src/qemu/qemu_command.c                                                 | 2 +-
+ tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args     | 2 +-
+ .../qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args                 | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index 311edd13e..141831635 100644
+--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
+@@ -727,7 +727,7 @@ qemuBuildTLSx509BackendProps(const char *tlspath,
+     if (virJSONValueObjectCreate(propsret,
+                                  "s:dir", path,
+                                  "s:endpoint", (isListen ? "server": "client"),
+-                                 "b:verify-peer", verifypeer,
+                                 "b:verify-peer", (isListen ? verifypeer : true),
+                                  NULL) < 0)
+         goto cleanup;
+ 
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args
+index b456cce30..003d11de7 100644
+--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args
+@@ -26,7 +26,7 @@ server,nowait \
+ localport=1111 \
+ -device isa-serial,chardev=charserial0,id=serial0 \
+ -object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,\
+-endpoint=client,verify-peer=no \
+endpoint=client,verify-peer=yes \
+ -chardev socket,id=charserial1,host=127.0.0.1,port=5555,\
+ tls-creds=objcharserial1_tls0 \
+ -device isa-serial,chardev=charserial1,id=serial1 \
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args
+index 7f9fedb6c..a020ff006 100644
+--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args
+@@ -31,7 +31,7 @@ localport=1111 \
+ data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
+ keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
+ -object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,\
+-endpoint=client,verify-peer=no,passwordid=charserial1-secret0 \
+endpoint=client,verify-peer=yes,passwordid=charserial1-secret0 \
+ -chardev socket,id=charserial1,host=127.0.0.1,port=5555,\
+ tls-creds=objcharserial1_tls0 \
+ -device isa-serial,chardev=charserial1,id=serial1 \
@@ -4,7 +4,7 @@ NAME := libvirt
 SPECFILE = $(firstword $(wildcard *.spec))

 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef

 MAKEFILE_COMMON := $(shell $(find-makefile-common))
@@ -1,51 +0,0 @@
-From 5f8d720b5f1393ee333a5fa8375ffe9ac954d48b Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Mon, 17 Aug 2009 08:32:08 +0100
-Subject: [PATCH] Disable sound cards when running sVirt
-
-Temporary hack till PulseAudio autostart problems are sorted out when
-SELinux enforcing (bz 486112)
-
-Fedora-patch: libvirt-0.6.4-svirt-sound.patch
---
- src/qemu_conf.c |   17 ++++++++++++++++-
- 1 files changed, 16 insertions(+), 1 deletions(-)
-
-diff --git a/src/qemu_conf.c b/src/qemu_conf.c
-index 6b0b404..53186e0 100644
--- a/src/qemu_conf.c
-+++ b/src/qemu_conf.c
-@@ -1384,6 +1384,20 @@ int qemudBuildCommandLine(virConnectPtr conn,
-     char uuid[VIR_UUID_STRING_BUFLEN];
-     char domid[50];
-     const char *cpu = NULL;
-+    int skipSound = 0;
-+
-+    if (driver->securityDriver &&
-+        driver->securityDriver->name &&
-+        STREQ(driver->securityDriver->name, "selinux") &&
-+        getuid() == 0) {
-+        static int soundWarned = 0;
-+        skipSound = 1;
-+        if (def->nsounds &&
-+            !soundWarned) {
-+            soundWarned = 1;
-+            VIR_WARN0("Sound cards for VMs are disabled while SELinux security model is active");
-+        }
-+    }
- 
-     uname_normalize(&ut);
- 
-@@ -2015,7 +2029,8 @@ int qemudBuildCommandLine(virConnectPtr conn,
-     }
- 
-     /* Add sound hardware */
-    if (def->nsounds) {
-+    if (def->nsounds &&
-+        !skipSound) {
-         int size = 100;
-         char *modstr;
-         if (VIR_ALLOC_N(modstr, size+1) < 0)
-- 
-1.6.2.5
-
@@ -1,79 +0,0 @@
-From 541cfdf5465ac3bba2c0c0901950547bc6638e47 Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Thu, 6 Aug 2009 15:14:19 +0100
-Subject: [PATCH] chown kernel/initrd before spawning qemu
-
-If we're running qemu unprivileged, we need to chown any supplied kernel
-or initrd before spawning it.
-
-* src/qemu_driver.c: rename qemuDomainSetDiskOwnership() to
-  qemuDomainSetFileOwnership(), pass it a path string instead of a disk
-  definition and use it for chowning the kernel/initrd in
-  qemuDomainSetAllDeviceOwnership()
-
-(cherry picked from commit c42b39784534930791d1feb3de859d85a7848168)
-
-Fedora-patch: libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch
---
- src/qemu_driver.c |   20 ++++++++++++--------
- 1 files changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 412b68d..bd58435 100644
--- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -1684,18 +1684,18 @@ static int qemuDomainSetHostdevOwnership(virConnectPtr conn,
- 
- }
- 
-static int qemuDomainSetDiskOwnership(virConnectPtr conn,
-                                      virDomainDiskDefPtr def,
-+static int qemuDomainSetFileOwnership(virConnectPtr conn,
-+                                      const char *path,
-                                       uid_t uid, gid_t gid)
- {
- 
-    if (!def->src)
-+    if (!path)
-         return 0;
- 
-    VIR_DEBUG("Setting ownership on %s to %d:%d", def->src, uid, gid);
-    if (chown(def->src, uid, gid) < 0) {
-+    VIR_DEBUG("Setting ownership on %s to %d:%d", path, uid, gid);
-+    if (chown(path, uid, gid) < 0) {
-         virReportSystemError(conn, errno, _("cannot set ownership on %s"),
-                             def->src);
-+                             path);
-         return -1;
-     }
-     return 0;
-@@ -1725,7 +1725,7 @@ static int qemuDomainSetDeviceOwnership(virConnectPtr conn,
-             (def->data.disk->readonly || def->data.disk->shared))
-             return 0;
- 
-        return qemuDomainSetDiskOwnership(conn, def->data.disk, uid, gid);
-+        return qemuDomainSetFileOwnership(conn, def->data.disk->src, uid, gid);
- 
-     case VIR_DOMAIN_DEVICE_HOSTDEV:
-         return qemuDomainSetHostdevOwnership(conn, def->data.hostdev, uid, gid);
-@@ -1753,12 +1753,16 @@ static int qemuDomainSetAllDeviceOwnership(virConnectPtr conn,
-     uid = restore ? 0 : driver->user;
-     gid = restore ? 0 : driver->group;
- 
-+    if (qemuDomainSetFileOwnership(conn, def->os.kernel, uid, gid) < 0 ||
-+        qemuDomainSetFileOwnership(conn, def->os.initrd, uid, gid) < 0)
-+        return -1;
-+
-     for (i = 0 ; i < def->ndisks ; i++) {
-         if (restore &&
-             (def->disks[i]->readonly || def->disks[i]->shared))
-             continue;
- 
-        if (qemuDomainSetDiskOwnership(conn, def->disks[i], uid, gid) < 0)
-+        if (qemuDomainSetFileOwnership(conn, def->disks[i]->src, uid, gid) < 0)
-             return -1;
-     }
- 
-- 
-1.6.2.5
-
@@ -1,45 +0,0 @@
-From ddf0a7cb04debe60825d11186e68cc6de6fd1dd2 Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Mon, 10 Aug 2009 11:16:37 +0100
-Subject: [PATCH] Handle kernels with no ipv6 support
-
-If the ipv6 kernel module is not loaded, then we get this when starting
-a virtual network:
-
-  libvir: Network Config error :
-  cannot enable /proc/sys/net/ipv6/conf/virbr0/disable_ipv6:
-  No such file or directory
-
-If disable_ipv6 is not present, we should just merrily continue on our
-way.
-
-* src/network_driver.c: make networkDisableIPV6() not fail if the kernel
-  has no ipv6 support
-
-(cherry picked from commit f5a8f969dd92ec2744e1eec5d35288d5fbcded22)
-
-Fedora-patch: libvirt-0.7.0-handle-kernels-with-no-ipv6-support.patch
---
- src/network_driver.c |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/src/network_driver.c b/src/network_driver.c
-index eaea454..84910ab 100644
--- a/src/network_driver.c
-+++ b/src/network_driver.c
-@@ -801,6 +801,12 @@ static int networkDisableIPV6(virConnectPtr conn,
-         goto cleanup;
-     }
- 
-+    if (access(field, W_OK) < 0 && errno == ENOENT) {
-+        VIR_DEBUG("ipv6 appears to already be disabled on %s", network->def->bridge);
-+        ret = 0;
-+        goto cleanup;
-+    }
-+
-     if (virFileWriteStr(field, "1") < 0) {
-         virReportSystemError(conn, errno,
-                              _("cannot enable %s"), field);
-- 
-1.6.2.5
-
@@ -1,96 +0,0 @@
-From 663bf081dc6737c7fcc68a7ca1169aca60fbf8e5 Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Thu, 13 Aug 2009 11:56:31 +0100
-Subject: [PATCH] Make LXC / UML drivers robust against NUMA topology brokenness
-
-Some kernel versions expose broken NUMA topology for some machines.
-This causes the LXC/UML drivers to fail to start. QEMU driver was
-already fixed for this problem
-
-* src/lxc_conf.c: Log and ignore failure to populate NUMA info
-* src/uml_conf.c: Log and ignore failure to populate NUMA info
-* src/capabilities.c: Reset nnumaCell to 0 after freeing
-
-(cherry picked from commit 19bac57b26c2d46ac8a7601158f210f34acdceac)
-
-Fedora-patch: libvirt-0.7.0-numa-ignore-fail.patch
---
- src/capabilities.c |    1 +
- src/lxc_conf.c     |   12 ++++++++++--
- src/uml_conf.c     |   11 +++++++++--
- 3 files changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/src/capabilities.c b/src/capabilities.c
-index c6766b6..193a9fe 100644
--- a/src/capabilities.c
-+++ b/src/capabilities.c
-@@ -139,6 +139,7 @@ virCapabilitiesFreeNUMAInfo(virCapsPtr caps)
-     for (i = 0 ; i < caps->host.nnumaCell ; i++)
-         virCapabilitiesFreeHostNUMACell(caps->host.numaCell[i]);
-     VIR_FREE(caps->host.numaCell);
-+    caps->host.nnumaCell = 0;
- }
- 
- /**
-diff --git a/src/lxc_conf.c b/src/lxc_conf.c
-index d06a024..fef60ba 100644
--- a/src/lxc_conf.c
-+++ b/src/lxc_conf.c
-@@ -30,6 +30,8 @@
- #include "lxc_conf.h"
- #include "nodeinfo.h"
- #include "virterror_internal.h"
-+#include "logging.h"
-+
- 
- #define VIR_FROM_THIS VIR_FROM_LXC
- 
-@@ -46,8 +48,14 @@ virCapsPtr lxcCapsInit(void)
-                                    0, 0)) == NULL)
-         goto no_memory;
- 
-    if (nodeCapsInitNUMA(caps) < 0)
-        goto no_memory;
-+    /* Some machines have problematic NUMA toplogy causing
-+     * unexpected failures. We don't want to break the QEMU
-+     * driver in this scenario, so log errors & carry on
-+     */
-+    if (nodeCapsInitNUMA(caps) < 0) {
-+        virCapabilitiesFreeNUMAInfo(caps);
-+        VIR_WARN0("Failed to query host NUMA topology, disabling NUMA capabilities");
-+    }
- 
-     /* XXX shouldn't 'borrow' KVM's prefix */
-     virCapabilitiesSetMacPrefix(caps, (unsigned char []){ 0x52, 0x54, 0x00 });
-diff --git a/src/uml_conf.c b/src/uml_conf.c
-index 48e05a8..4f756d4 100644
--- a/src/uml_conf.c
-+++ b/src/uml_conf.c
-@@ -45,6 +45,7 @@
- #include "nodeinfo.h"
- #include "verify.h"
- #include "bridge.h"
-+#include "logging.h"
- 
- #define VIR_FROM_THIS VIR_FROM_UML
- 
-@@ -63,8 +64,14 @@ virCapsPtr umlCapsInit(void) {
-                                    0, 0)) == NULL)
-         goto no_memory;
- 
-    if (nodeCapsInitNUMA(caps) < 0)
-        goto no_memory;
-+    /* Some machines have problematic NUMA toplogy causing
-+     * unexpected failures. We don't want to break the QEMU
-+     * driver in this scenario, so log errors & carry on
-+     */
-+    if (nodeCapsInitNUMA(caps) < 0) {
-+        virCapabilitiesFreeNUMAInfo(caps);
-+        VIR_WARN0("Failed to query host NUMA topology, disabling NUMA capabilities");
-+    }
- 
-     if ((guest = virCapabilitiesAddGuest(caps,
-                                          "uml",
-- 
-1.6.2.5
-
@@ -1,505 +0,0 @@
-From d54fc5008d465d192101a0cb78fd02c437dff736 Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrange <berrange@redhat.com>
-Date: Mon, 17 Aug 2009 08:32:08 +0100
-Subject: [PATCH] Policykit rewrite (bug #499970)
-
-Fedora-patch: libvirt-0.7.0-policy-kit-rewrite.patch
---
- configure.in            |   73 ++++++++++++++++++++++++++++--------------
- qemud/Makefile.am       |   11 +++++-
- qemud/libvirtd.policy   |   42 ------------------------
- qemud/libvirtd.policy-0 |   42 ++++++++++++++++++++++++
- qemud/libvirtd.policy-1 |   42 ++++++++++++++++++++++++
- qemud/qemud.c           |    4 +-
- qemud/qemud.h           |    4 +-
- qemud/remote.c          |   81 ++++++++++++++++++++++++++++++++++++++++++++--
- src/remote_internal.c   |    7 ++++
- 9 files changed, 230 insertions(+), 76 deletions(-)
- delete mode 100644 qemud/libvirtd.policy
- create mode 100644 qemud/libvirtd.policy-0
- create mode 100644 qemud/libvirtd.policy-1
-
-diff --git a/configure.in b/configure.in
-index 45fa9ed..d28c44a 100644
--- a/configure.in
-+++ b/configure.in
-@@ -641,40 +641,61 @@ AC_SUBST([SASL_LIBS])
- dnl PolicyKit library
- POLKIT_CFLAGS=
- POLKIT_LIBS=
-+PKCHECK_PATH=
- AC_ARG_WITH([polkit],
-   [  --with-polkit         use PolicyKit for UNIX socket access checks],
-   [],
-   [with_polkit=check])
- 
-+with_polkit0=no
-+with_polkit1=no
- if test "x$with_polkit" = "xyes" -o "x$with_polkit" = "xcheck"; then
-  PKG_CHECK_MODULES(POLKIT, polkit-dbus >= $POLKIT_REQUIRED,
-    [with_polkit=yes], [
-    if test "x$with_polkit" = "xcheck" ; then
-       with_polkit=no
-    else
-       AC_MSG_ERROR(
-         [You must install PolicyKit >= $POLKIT_REQUIRED to compile libvirt])
-    fi
-  ])
-  if test "x$with_polkit" = "xyes" ; then
-+  dnl Check for new polkit first - just a binary
-+  AC_PATH_PROG([PKCHECK_PATH],[pkcheck], [], [/usr/sbin:$PATH])
-+  if test "x$PKCHECK_PATH" != "x" ; then
-+    AC_DEFINE_UNQUOTED([PKCHECK_PATH],["$PKCHECK_PATH"],[Location of pkcheck program])
-     AC_DEFINE_UNQUOTED([HAVE_POLKIT], 1,
-      [use PolicyKit for UNIX socket access checks])
-
-    old_CFLAGS=$CFLAGS
-    old_LDFLAGS=$LDFLAGS
-    CFLAGS="$CFLAGS $POLKIT_CFLAGS"
-    LDFLAGS="$LDFLAGS $POLKIT_LIBS"
-    AC_CHECK_FUNCS([polkit_context_is_caller_authorized])
-    CFLAGS="$old_CFLAGS"
-    LDFLAGS="$old_LDFLAGS"
-
-    AC_PATH_PROG([POLKIT_AUTH], [polkit-auth])
-    if test "x$POLKIT_AUTH" != "x"; then
-      AC_DEFINE_UNQUOTED([POLKIT_AUTH],["$POLKIT_AUTH"],[Location of polkit-auth program])
-+        [use PolicyKit for UNIX socket access checks])
-+    AC_DEFINE_UNQUOTED([HAVE_POLKIT1], 1,
-+        [use PolicyKit for UNIX socket access checks])
-+    with_polkit="yes"
-+    with_polkit1="yes"
-+  else
-+    dnl Check for old polkit second - library + binary
-+    PKG_CHECK_MODULES(POLKIT, polkit-dbus >= $POLKIT_REQUIRED,
-+      [with_polkit=yes], [
-+      if test "x$with_polkit" = "xcheck" ; then
-+         with_polkit=no
-+      else
-+         AC_MSG_ERROR(
-+           [You must install PolicyKit >= $POLKIT_REQUIRED to compile libvirt])
-+      fi
-+    ])
-+    if test "x$with_polkit" = "xyes" ; then
-+      AC_DEFINE_UNQUOTED([HAVE_POLKIT], 1,
-+        [use PolicyKit for UNIX socket access checks])
-+      AC_DEFINE_UNQUOTED([HAVE_POLKIT0], 1,
-+        [use PolicyKit for UNIX socket access checks])
-+
-+      old_CFLAGS=$CFLAGS
-+      old_LDFLAGS=$LDFLAGS
-+      CFLAGS="$CFLAGS $POLKIT_CFLAGS"
-+      LDFLAGS="$LDFLAGS $POLKIT_LIBS"
-+      AC_CHECK_FUNCS([polkit_context_is_caller_authorized])
-+      CFLAGS="$old_CFLAGS"
-+      LDFLAGS="$old_LDFLAGS"
-+
-+      AC_PATH_PROG([POLKIT_AUTH], [polkit-auth])
-+      if test "x$POLKIT_AUTH" != "x"; then
-+        AC_DEFINE_UNQUOTED([POLKIT_AUTH],["$POLKIT_AUTH"],[Location of polkit-auth program])
-+      fi
-+      with_polkit0="yes"
-     fi
-   fi
- fi
- AM_CONDITIONAL([HAVE_POLKIT], [test "x$with_polkit" = "xyes"])
-+AM_CONDITIONAL([HAVE_POLKIT0], [test "x$with_polkit0" = "xyes"])
-+AM_CONDITIONAL([HAVE_POLKIT1], [test "x$with_polkit1" = "xyes"])
- AC_SUBST([POLKIT_CFLAGS])
- AC_SUBST([POLKIT_LIBS])
- 
-@@ -1695,7 +1716,11 @@ else
- AC_MSG_NOTICE([   avahi: no])
- fi
- if test "$with_polkit" = "yes" ; then
-AC_MSG_NOTICE([  polkit: $POLKIT_CFLAGS $POLKIT_LIBS])
-+if test "$with_polkit0" = "yes" ; then
-+AC_MSG_NOTICE([  polkit: $POLKIT_CFLAGS $POLKIT_LIBS (version 0)])
-+else
-+AC_MSG_NOTICE([  polkit: $PKCHECK_PATH (version 1)])
-+fi
- else
- AC_MSG_NOTICE([  polkit: no])
- fi
-diff --git a/qemud/Makefile.am b/qemud/Makefile.am
-index 959ff88..3d143da 100644
--- a/qemud/Makefile.am
-+++ b/qemud/Makefile.am
-@@ -21,7 +21,8 @@ EXTRA_DIST =						\
- 	remote_protocol.x				\
- 	libvirtd.conf					\
- 	libvirtd.init.in				\
-	libvirtd.policy					\
-+	libvirtd.policy-0				\
-+	libvirtd.policy-1				\
- 	libvirtd.sasl					\
- 	libvirtd.sysconf				\
- 	libvirtd.aug                                    \
-@@ -147,7 +148,13 @@ endif
- libvirtd_LDADD += ../src/libvirt.la
- 
- if HAVE_POLKIT
-+if HAVE_POLKIT0
- policydir = $(datadir)/PolicyKit/policy
-+policyfile = libvirtd.policy-0
-+else
-+policydir = $(datadir)/polkit-1/actions
-+policyfile = libvirtd.policy-1
-+endif
- endif
- 
- if HAVE_AVAHI
-@@ -197,7 +204,7 @@ endif
- if HAVE_POLKIT
- install-data-polkit:: install-init
- 	mkdir -p $(DESTDIR)$(policydir)
-	$(INSTALL_DATA) $(srcdir)/libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.policy
-+	$(INSTALL_DATA) $(srcdir)/$(policyfile) $(DESTDIR)$(policydir)/org.libvirt.unix.policy
- uninstall-data-polkit:: install-init
- 	rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy
- else
-diff --git a/qemud/libvirtd.policy b/qemud/libvirtd.policy
-deleted file mode 100644
-index b6da946..0000000
--- a/qemud/libvirtd.policy
-+++ /dev/null
-@@ -1,42 +0,0 @@
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-
-<!--
-Policy definitions for libvirt daemon
-
-Copyright (c) 2007 Daniel P. Berrange <berrange redhat com>
-
-libvirt is licensed to you under the GNU Lesser General Public License
-version 2. See COPYING for details.
-
-NOTE: If you make changes to this file, make sure to validate the file
-using the polkit-policy-file-validate(1) tool. Changes made to this
-file are instantly applied.
--->
-
-<policyconfig>
-    <action id="org.libvirt.unix.monitor">
-      <description>Monitor local virtualized systems</description>
-      <message>System policy prevents monitoring of local virtualized systems</message>
-      <defaults>
-        <!-- Any program can use libvirt in read-only mode for monitoring,
-             even if not part of a session -->
-        <allow_any>yes</allow_any>
-        <allow_inactive>yes</allow_inactive>
-        <allow_active>yes</allow_active>
-      </defaults>
-    </action>
-
-    <action id="org.libvirt.unix.manage">
-      <description>Manage local virtualized systems</description>
-      <message>System policy prevents management of local virtualized systems</message>
-      <defaults>
-        <!-- Only a program in the active host session can use libvirt in
-             read-write mode for management, and we require user password -->
-        <allow_any>no</allow_any>
-        <allow_inactive>no</allow_inactive>
-        <allow_active>auth_admin_keep_session</allow_active>
-      </defaults>
-    </action>
-</policyconfig>
-diff --git a/qemud/libvirtd.policy-0 b/qemud/libvirtd.policy-0
-new file mode 100644
-index 0000000..b6da946
--- /dev/null
-+++ b/qemud/libvirtd.policy-0
-@@ -0,0 +1,42 @@
-+<!DOCTYPE policyconfig PUBLIC
-+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
-+ "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-+
-+<!--
-+Policy definitions for libvirt daemon
-+
-+Copyright (c) 2007 Daniel P. Berrange <berrange redhat com>
-+
-+libvirt is licensed to you under the GNU Lesser General Public License
-+version 2. See COPYING for details.
-+
-+NOTE: If you make changes to this file, make sure to validate the file
-+using the polkit-policy-file-validate(1) tool. Changes made to this
-+file are instantly applied.
-+-->
-+
-+<policyconfig>
-+    <action id="org.libvirt.unix.monitor">
-+      <description>Monitor local virtualized systems</description>
-+      <message>System policy prevents monitoring of local virtualized systems</message>
-+      <defaults>
-+        <!-- Any program can use libvirt in read-only mode for monitoring,
-+             even if not part of a session -->
-+        <allow_any>yes</allow_any>
-+        <allow_inactive>yes</allow_inactive>
-+        <allow_active>yes</allow_active>
-+      </defaults>
-+    </action>
-+
-+    <action id="org.libvirt.unix.manage">
-+      <description>Manage local virtualized systems</description>
-+      <message>System policy prevents management of local virtualized systems</message>
-+      <defaults>
-+        <!-- Only a program in the active host session can use libvirt in
-+             read-write mode for management, and we require user password -->
-+        <allow_any>no</allow_any>
-+        <allow_inactive>no</allow_inactive>
-+        <allow_active>auth_admin_keep_session</allow_active>
-+      </defaults>
-+    </action>
-+</policyconfig>
-diff --git a/qemud/libvirtd.policy-1 b/qemud/libvirtd.policy-1
-new file mode 100644
-index 0000000..6fa3a5e
--- /dev/null
-+++ b/qemud/libvirtd.policy-1
-@@ -0,0 +1,42 @@
-+<!DOCTYPE policyconfig PUBLIC
-+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
-+ "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-+
-+<!--
-+Policy definitions for libvirt daemon
-+
-+Copyright (c) 2007 Daniel P. Berrange <berrange redhat com>
-+
-+libvirt is licensed to you under the GNU Lesser General Public License
-+version 2. See COPYING for details.
-+
-+NOTE: If you make changes to this file, make sure to validate the file
-+using the polkit-policy-file-validate(1) tool. Changes made to this
-+file are instantly applied.
-+-->
-+
-+<policyconfig>
-+    <action id="org.libvirt.unix.monitor">
-+      <description>Monitor local virtualized systems</description>
-+      <message>System policy prevents monitoring of local virtualized systems</message>
-+      <defaults>
-+        <!-- Any program can use libvirt in read-only mode for monitoring,
-+             even if not part of a session -->
-+        <allow_any>yes</allow_any>
-+        <allow_inactive>yes</allow_inactive>
-+        <allow_active>yes</allow_active>
-+      </defaults>
-+    </action>
-+
-+    <action id="org.libvirt.unix.manage">
-+      <description>Manage local virtualized systems</description>
-+      <message>System policy prevents management of local virtualized systems</message>
-+      <defaults>
-+        <!-- Only a program in the active host session can use libvirt in
-+             read-write mode for management, and we require user password -->
-+        <allow_any>no</allow_any>
-+        <allow_inactive>no</allow_inactive>
-+        <allow_active>auth_admin_keep</allow_active>
-+      </defaults>
-+    </action>
-+</policyconfig>
-diff --git a/qemud/qemud.c b/qemud/qemud.c
-index 3e551ca..50b0cdd 100644
--- a/qemud/qemud.c
-+++ b/qemud/qemud.c
-@@ -895,7 +895,7 @@ static struct qemud_server *qemudNetworkInit(struct qemud_server *server) {
-     }
- #endif
- 
-#ifdef HAVE_POLKIT
-+#if HAVE_POLKIT0
-     if (auth_unix_rw == REMOTE_AUTH_POLKIT ||
-         auth_unix_ro == REMOTE_AUTH_POLKIT) {
-         DBusError derr;
-@@ -982,7 +982,7 @@ static struct qemud_server *qemudNetworkInit(struct qemud_server *server) {
-             sock = sock->next;
-         }
- 
-#ifdef HAVE_POLKIT
-+#if HAVE_POLKIT0
-         if (server->sysbus)
-             dbus_connection_unref(server->sysbus);
- #endif
-diff --git a/qemud/qemud.h b/qemud/qemud.h
-index 254db44..e8ce209 100644
--- a/qemud/qemud.h
-+++ b/qemud/qemud.h
-@@ -34,7 +34,7 @@
- #include <sasl/sasl.h>
- #endif
- 
-#ifdef HAVE_POLKIT
-+#if HAVE_POLKIT0
- #include <dbus/dbus.h>
- #endif
- 
-@@ -253,7 +253,7 @@ struct qemud_server {
- #if HAVE_SASL
-     char **saslUsernameWhitelist;
- #endif
-#if HAVE_POLKIT
-+#if HAVE_POLKIT0
-     DBusConnection *sysbus;
- #endif
- };
-diff --git a/qemud/remote.c b/qemud/remote.c
-index d32d513..490a807 100644
--- a/qemud/remote.c
-+++ b/qemud/remote.c
-@@ -43,7 +43,7 @@
- #include <fnmatch.h>
- #include "virterror_internal.h"
- 
-#ifdef HAVE_POLKIT
-+#if HAVE_POLKIT0
- #include <polkit/polkit.h>
- #include <polkit-dbus/polkit-dbus.h>
- #endif
-@@ -3106,7 +3106,80 @@ remoteDispatchAuthSaslStep (struct qemud_server *server ATTRIBUTE_UNUSED,
- #endif /* HAVE_SASL */
- 
- 
-#if HAVE_POLKIT
-+#if HAVE_POLKIT1
-+static int
-+remoteDispatchAuthPolkit (struct qemud_server *server,
-+                          struct qemud_client *client,
-+                          virConnectPtr conn ATTRIBUTE_UNUSED,
-+                          remote_error *rerr,
-+                          void *args ATTRIBUTE_UNUSED,
-+                          remote_auth_polkit_ret *ret)
-+{
-+    pid_t callerPid;
-+    uid_t callerUid;
-+    const char *action;
-+    int status = -1;
-+    char pidbuf[50];
-+    int rv;
-+
-+    virMutexLock(&server->lock);
-+    virMutexLock(&client->lock);
-+    virMutexUnlock(&server->lock);
-+
-+    action = client->readonly ?
-+        "org.libvirt.unix.monitor" :
-+        "org.libvirt.unix.manage";
-+
-+    const char * const pkcheck [] = {
-+      PKCHECK_PATH,
-+      "--action-id", action,
-+      "--process", pidbuf,
-+      "--allow-user-interaction",
-+      NULL
-+    };
-+
-+    REMOTE_DEBUG("Start PolicyKit auth %d", client->fd);
-+    if (client->auth != REMOTE_AUTH_POLKIT) {
-+        VIR_ERROR0(_("client tried invalid PolicyKit init request"));
-+        goto authfail;
-+    }
-+
-+    if (qemudGetSocketIdentity(client->fd, &callerUid, &callerPid) < 0) {
-+        VIR_ERROR0(_("cannot get peer socket identity"));
-+        goto authfail;
-+    }
-+
-+    VIR_INFO(_("Checking PID %d running as %d"), callerPid, callerUid);
-+
-+    rv = snprintf(pidbuf, sizeof pidbuf, "%d", callerPid);
-+    if (rv < 0 || rv >= sizeof pidbuf) {
-+        VIR_ERROR(_("Caller PID was too large %d"), callerPid);
-+	goto authfail;
-+    }
-+
-+    if (virRun(NULL, pkcheck, &status) < 0) {
-+        VIR_ERROR(_("Cannot invoke %s"), PKCHECK_PATH);
-+	goto authfail;
-+    }
-+    if (status != 0) {
-+        VIR_ERROR(_("Policy kit denied action %s from pid %d, uid %d, result: %d\n"),
-+                  action, callerPid, callerUid, status);
-+        goto authfail;
-+    }
-+    VIR_INFO(_("Policy allowed action %s from pid %d, uid %d"),
-+             action, callerPid, callerUid);
-+    ret->complete = 1;
-+    client->auth = REMOTE_AUTH_NONE;
-+
-+    virMutexUnlock(&client->lock);
-+    return 0;
-+
-+authfail:
-+    remoteDispatchAuthError(rerr);
-+    virMutexUnlock(&client->lock);
-+    return -1;
-+}
-+#elif HAVE_POLKIT0
- static int
- remoteDispatchAuthPolkit (struct qemud_server *server,
-                           struct qemud_client *client,
-@@ -3217,7 +3290,7 @@ authfail:
-     return -1;
- }
- 
-#else /* HAVE_POLKIT */
-+#else /* !HAVE_POLKIT0 & !HAVE_POLKIT1*/
- 
- static int
- remoteDispatchAuthPolkit (struct qemud_server *server ATTRIBUTE_UNUSED,
-@@ -3231,7 +3304,7 @@ remoteDispatchAuthPolkit (struct qemud_server *server ATTRIBUTE_UNUSED,
-     remoteDispatchAuthError(rerr);
-     return -1;
- }
-#endif /* HAVE_POLKIT */
-+#endif /* HAVE_POLKIT1 */
- 
- 
- /***************************************************************
-diff --git a/src/remote_internal.c b/src/remote_internal.c
-index a58b768..e98c99b 100644
--- a/src/remote_internal.c
-+++ b/src/remote_internal.c
-@@ -6201,6 +6201,7 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open,
-                   virConnectAuthPtr auth)
- {
-     remote_auth_polkit_ret ret;
-+#if HAVE_POLKIT0
-     int i, allowcb = 0;
-     virConnectCredential cred = {
-         VIR_CRED_EXTERNAL,
-@@ -6210,8 +6211,10 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open,
-         NULL,
-         0,
-     };
-+#endif
-     DEBUG0("Client initialize PolicyKit authentication");
- 
-+#if HAVE_POLKIT0
-     if (auth && auth->cb) {
-         /* Check if the necessary credential type for PolicyKit is supported */
-         for (i = 0 ; i < auth->ncredtype ; i++) {
-@@ -6220,6 +6223,7 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open,
-         }
- 
-         if (allowcb) {
-+            DEBUG0("Client run callback for PolicyKit authentication");
-             /* Run the authentication callback */
-             if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0) {
-                 virRaiseError (in_open ? NULL : conn, NULL, NULL, VIR_FROM_REMOTE,
-@@ -6233,6 +6237,9 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open,
-     } else {
-         DEBUG0("No auth callback provided");
-     }
-+#else
-+    DEBUG0("No auth callback required for PolicyKit-1");
-+#endif
- 
-     memset (&ret, 0, sizeof ret);
-     if (call (conn, priv, in_open, REMOTE_PROC_AUTH_POLKIT,
-- 
-1.6.2.5
-
@@ -1,465 +0,0 @@
-From 332979bb680d833529ab9cecac6828c6ce54d731 Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Fri, 14 Aug 2009 08:31:10 +0100
-Subject: [PATCH] Add host PCI device hotplug support
-
-Attaching a host PCI device to a qemu guest is done with a
-straightforward 'pci_add pci_addr auto host host=XX:XX.X' command.
-
-Like with NIC and disk hotplug, we need to retain the guest PCI address
-assigned by qemu so that we can use it for hot-unplug.
-
-Identifying a device for detach is done using the host PCI address.
-
-Managed mode is handled by detaching/resetting the device before
-attaching it to the guest and re-attaching it after detaching it from
-the guest.
-
-(cherry picked from commit 7636ef4630fc15c3d559eceb5b5c4fb1524b7c5a)
-(cherry picked from commit 0c5b7b93a3cdb197c55d79c2605e9e19e3af43f5)
-(cherry picked from commit 60ff07585ca8f7e639fed477e2e2cf79ce1c5c21)
-(cherry picked from commit 4e12af5623e4a962a6bb911af06fa29aa85befba)
-(cherry picked from commit 4dbecff9fbd5b5d1154bc7a41a5d4dd00533b359)
-(cherry picked from commit 12edef9a6aca5bd9a2ea18b73ca862f615684d84)
-(cherry picked from commit 457e05062863a35c7efb35470886b9b83a49d04d)
-(cherry picked from commit e8ad33931296c67de0538e78d12e21706a826d37)
-
-Fedora-patch: libvirt-add-pci-hostdev-hotplug-support.patch
---
- src/domain_conf.c        |   33 +++++-
- src/domain_conf.h        |   13 +++
- src/libvirt_private.syms |    2 +
- src/qemu_driver.c        |  266 ++++++++++++++++++++++++++++++++++++++++++++--
- 4 files changed, 300 insertions(+), 14 deletions(-)
-
-diff --git a/src/domain_conf.c b/src/domain_conf.c
-index 2301a96..bad53f7 100644
--- a/src/domain_conf.c
-+++ b/src/domain_conf.c
-@@ -1977,7 +1977,8 @@ out:
- static int
- virDomainHostdevSubsysPciDefParseXML(virConnectPtr conn,
-                                      const xmlNodePtr node,
-                                     virDomainHostdevDefPtr def) {
-+                                     virDomainHostdevDefPtr def,
-+                                     int flags) {
- 
-     int ret = -1;
-     xmlNodePtr cur;
-@@ -2049,6 +2050,20 @@ virDomainHostdevSubsysPciDefParseXML(virConnectPtr conn,
-                                          _("pci address needs function id"));
-                     goto out;
-                 }
-+            } else if ((flags & VIR_DOMAIN_XML_INTERNAL_STATUS) &&
-+                       xmlStrEqual(cur->name, BAD_CAST "state")) {
-+                char *devaddr = virXMLPropString(cur, "devaddr");
-+                if (devaddr &&
-+                    sscanf(devaddr, "%x:%x:%x",
-+                           &def->source.subsys.u.pci.guest_addr.domain,
-+                           &def->source.subsys.u.pci.guest_addr.bus,
-+                           &def->source.subsys.u.pci.guest_addr.slot) < 3) {
-+                    virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR,
-+                                         _("Unable to parse devaddr parameter '%s'"),
-+                                         devaddr);
-+                    VIR_FREE(devaddr);
-+                    goto out;
-+                }
-             } else {
-                 virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR,
-                                      _("unknown pci source type '%s'"),
-@@ -2123,7 +2138,7 @@ virDomainHostdevDefParseXML(virConnectPtr conn,
-                 }
-                 if (def->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
-                     def->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
-                        if (virDomainHostdevSubsysPciDefParseXML(conn, cur, def) < 0)
-+                        if (virDomainHostdevSubsysPciDefParseXML(conn, cur, def, flags) < 0)
-                             goto error;
-                 }
-             } else {
-@@ -3937,7 +3952,8 @@ virDomainGraphicsDefFormat(virConnectPtr conn,
- static int
- virDomainHostdevDefFormat(virConnectPtr conn,
-                           virBufferPtr buf,
-                          virDomainHostdevDefPtr def)
-+                          virDomainHostdevDefPtr def,
-+                          int flags)
- {
-     const char *mode = virDomainHostdevModeTypeToString(def->mode);
-     const char *type;
-@@ -3978,6 +3994,15 @@ virDomainHostdevDefFormat(virConnectPtr conn,
-                           def->source.subsys.u.pci.bus,
-                           def->source.subsys.u.pci.slot,
-                           def->source.subsys.u.pci.function);
-+        if (flags & VIR_DOMAIN_XML_INTERNAL_STATUS) {
-+            virBufferAddLit(buf, "      <state");
-+            if (virHostdevHasValidGuestAddr(def))
-+                virBufferVSprintf(buf, " devaddr='%.4x:%.2x:%.2x'",
-+                                  def->source.subsys.u.pci.guest_addr.domain,
-+                                  def->source.subsys.u.pci.guest_addr.bus,
-+                                  def->source.subsys.u.pci.guest_addr.slot);
-+            virBufferAddLit(buf, "/>\n");
-+        }
-     }
- 
-     virBufferAddLit(buf, "      </source>\n");
-@@ -4192,7 +4217,7 @@ char *virDomainDefFormat(virConnectPtr conn,
-             goto cleanup;
- 
-     for (n = 0 ; n < def->nhostdevs ; n++)
-        if (virDomainHostdevDefFormat(conn, &buf, def->hostdevs[n]) < 0)
-+        if (virDomainHostdevDefFormat(conn, &buf, def->hostdevs[n], flags) < 0)
-             goto cleanup;
- 
-     virBufferAddLit(&buf, "  </devices>\n");
-diff --git a/src/domain_conf.h b/src/domain_conf.h
-index 63fca76..44302be 100644
--- a/src/domain_conf.h
-+++ b/src/domain_conf.h
-@@ -391,6 +391,11 @@ struct _virDomainHostdevDef {
-                      unsigned bus;
-                      unsigned slot;
-                      unsigned function;
-+                    struct {
-+                        unsigned domain;
-+                        unsigned bus;
-+                        unsigned slot;
-+                    } guest_addr;
-                 } pci;
-             } u;
-         } subsys;
-@@ -404,6 +409,14 @@ struct _virDomainHostdevDef {
-     char* target;
- };
- 
-+static inline int
-+virHostdevHasValidGuestAddr(virDomainHostdevDefPtr def)
-+{
-+    return def->source.subsys.u.pci.guest_addr.domain ||
-+           def->source.subsys.u.pci.guest_addr.bus ||
-+           def->source.subsys.u.pci.guest_addr.slot;
-+}
-+
- /* Flags for the 'type' field in next struct */
- enum virDomainDeviceType {
-     VIR_DOMAIN_DEVICE_DISK,
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 4f1b01f..22131c4 100644
--- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -88,6 +88,8 @@ virDomainGetRootFilesystem;
- virDomainGraphicsTypeFromString;
- virDomainGraphicsDefFree;
- virDomainHostdevDefFree;
-+virDomainHostdevModeTypeToString;
-+virDomainHostdevSubsysTypeToString;
- virDomainInputDefFree;
- virDomainLifecycleTypeFromString;
- virDomainLifecycleTypeToString;
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index cbc27c4..99dac52 100644
--- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -5258,9 +5258,91 @@ cleanup:
-     return -1;
- }
- 
-static int qemudDomainAttachHostDevice(virConnectPtr conn,
-                                       virDomainObjPtr vm,
-                                       virDomainDeviceDefPtr dev)
-+static int qemudDomainAttachHostPciDevice(virConnectPtr conn,
-+                                          struct qemud_driver *driver,
-+                                          virDomainObjPtr vm,
-+                                          virDomainDeviceDefPtr dev)
-+{
-+    virDomainHostdevDefPtr hostdev = dev->data.hostdev;
-+    char *cmd, *reply;
-+    unsigned domain, bus, slot;
-+    pciDevice *pci;
-+
-+    if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs+1) < 0) {
-+        virReportOOMError(conn);
-+        return -1;
-+    }
-+
-+    pci = pciGetDevice(conn,
-+                       hostdev->source.subsys.u.pci.domain,
-+                       hostdev->source.subsys.u.pci.bus,
-+                       hostdev->source.subsys.u.pci.slot,
-+                       hostdev->source.subsys.u.pci.function);
-+    if (!dev)
-+        return -1;
-+
-+    if ((hostdev->managed && pciDettachDevice(conn, pci) < 0) ||
-+        pciResetDevice(conn, pci, driver->activePciHostdevs) < 0) {
-+        pciFreeDevice(conn, pci);
-+        return -1;
-+    }
-+
-+    if (pciDeviceListAdd(conn, driver->activePciHostdevs, pci) < 0) {
-+        pciFreeDevice(conn, pci);
-+        return -1;
-+    }
-+
-+    cmd = reply = NULL;
-+
-+    if (virAsprintf(&cmd, "pci_add pci_addr=auto host host=%.2x:%.2x.%.1x",
-+                    hostdev->source.subsys.u.pci.bus,
-+                    hostdev->source.subsys.u.pci.slot,
-+                    hostdev->source.subsys.u.pci.function) < 0) {
-+        virReportOOMError(conn);
-+        goto error;
-+    }
-+
-+    if (qemudMonitorCommand(vm, cmd, &reply) < 0) {
-+        qemudReportError(conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
-+                         "%s", _("cannot attach host pci device"));
-+        goto error;
-+    }
-+
-+    if (strstr(reply, "invalid type: host")) {
-+        qemudReportError(conn, dom, NULL, VIR_ERR_NO_SUPPORT, "%s",
-+                         _("PCI device assignment is not supported by this version of qemu"));
-+        goto error;
-+    }
-+
-+    if (qemudParsePciAddReply(vm, reply, &domain, &bus, &slot) < 0) {
-+        qemudReportError(conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
-+                         _("parsing pci_add reply failed: %s"), reply);
-+        goto error;
-+    }
-+
-+    hostdev->source.subsys.u.pci.guest_addr.domain = domain;
-+    hostdev->source.subsys.u.pci.guest_addr.bus    = bus;
-+    hostdev->source.subsys.u.pci.guest_addr.slot   = slot;
-+
-+    vm->def->hostdevs[vm->def->nhostdevs++] = hostdev;
-+
-+    VIR_FREE(reply);
-+    VIR_FREE(cmd);
-+
-+    return 0;
-+
-+error:
-+    pciDeviceListDel(conn, driver->activePciHostdevs, pci);
-+
-+    VIR_FREE(reply);
-+    VIR_FREE(cmd);
-+
-+    return -1;
-+}
-+
-+static int qemudDomainAttachHostUsbDevice(virConnectPtr conn,
-+                                          virDomainObjPtr vm,
-+                                          virDomainDeviceDefPtr dev)
- {
-     int ret;
-     char *cmd, *reply;
-@@ -5310,6 +5392,36 @@ static int qemudDomainAttachHostDevice(virConnectPtr conn,
-     return 0;
- }
- 
-+static int qemudDomainAttachHostDevice(virConnectPtr conn,
-+                                       struct qemud_driver *driver,
-+                                       virDomainObjPtr vm,
-+                                       virDomainDeviceDefPtr dev)
-+{
-+    virDomainHostdevDefPtr hostdev = dev->data.hostdev;
-+
-+    if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) {
-+        qemudReportError(conn, dom, NULL, VIR_ERR_NO_SUPPORT,
-+                         _("hostdev mode '%s' not supported"),
-+                         virDomainHostdevModeTypeToString(hostdev->mode));
-+        return -1;
-+    }
-+
-+    if (qemuDomainSetDeviceOwnership(conn, driver, dev, 0) < 0)
-+        return -1;
-+
-+    switch (hostdev->source.subsys.type) {
-+    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
-+        return qemudDomainAttachHostPciDevice(conn, driver, vm, dev);
-+    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
-+        return qemudDomainAttachHostUsbDevice(conn, vm, dev);
-+    default:
-+        qemudReportError(conn, dom, NULL, VIR_ERR_NO_SUPPORT,
-+                         _("hostdev subsys type '%s' not supported"),
-+                         virDomainHostdevSubsysTypeToString(hostdev->source.subsys.type));
-+        return -1;
-+    }
-+}
-+
- static int qemudDomainAttachDevice(virDomainPtr dom,
-                                    const char *xml) {
-     struct qemud_driver *driver = dom->conn->privateData;
-@@ -5411,13 +5523,8 @@ static int qemudDomainAttachDevice(virDomainPtr dom,
-         }
-     } else if (dev->type == VIR_DOMAIN_DEVICE_NET) {
-         ret = qemudDomainAttachNetDevice(dom->conn, driver, vm, dev, qemuCmdFlags);
-    } else 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_USB) {
-        if (qemuDomainSetDeviceOwnership(dom->conn, driver, dev, 0) < 0)
-            goto cleanup;
-
-        ret = qemudDomainAttachHostDevice(dom->conn, vm, dev);
-+    } else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) {
-+        ret = qemudDomainAttachHostDevice(dom->conn, driver, vm, dev);
-     } else {
-         qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_SUPPORT,
-                          _("device type '%s' cannot be attached"),
-@@ -5630,6 +5737,143 @@ cleanup:
-     return ret;
- }
- 
-+static int qemudDomainDetachHostPciDevice(virConnectPtr conn,
-+                                          struct qemud_driver *driver,
-+                                          virDomainObjPtr vm,
-+                                          virDomainDeviceDefPtr dev)
-+{
-+    virDomainHostdevDefPtr detach;
-+    char *cmd, *reply;
-+    int i, ret;
-+    pciDevice *pci;
-+
-+    for (i = 0 ; i < vm->def->nhostdevs ; i++) {
-+        unsigned domain   = vm->def->hostdevs[i]->source.subsys.u.pci.domain;
-+        unsigned bus      = vm->def->hostdevs[i]->source.subsys.u.pci.bus;
-+        unsigned slot     = vm->def->hostdevs[i]->source.subsys.u.pci.slot;
-+        unsigned function = vm->def->hostdevs[i]->source.subsys.u.pci.function;
-+
-+        if (dev->data.hostdev->source.subsys.u.pci.domain   == domain &&
-+            dev->data.hostdev->source.subsys.u.pci.bus      == bus &&
-+            dev->data.hostdev->source.subsys.u.pci.slot     == slot &&
-+            dev->data.hostdev->source.subsys.u.pci.function == function) {
-+            detach = vm->def->hostdevs[i];
-+            break;
-+        }
-+    }
-+
-+    if (!detach) {
-+        qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
-+                         _("host pci device %.4x:%.2x:%.2x.%.1x not found"),
-+                         dev->data.hostdev->source.subsys.u.pci.domain,
-+                         dev->data.hostdev->source.subsys.u.pci.bus,
-+                         dev->data.hostdev->source.subsys.u.pci.slot,
-+                         dev->data.hostdev->source.subsys.u.pci.function);
-+        return -1;
-+    }
-+
-+    if (!virHostdevHasValidGuestAddr(detach)) {
-+        qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
-+                         "%s", _("hostdev cannot be detached - device state missing"));
-+        return -1;
-+    }
-+
-+    if (virAsprintf(&cmd, "pci_del pci_addr=%.4x:%.2x:%.2x",
-+                    detach->source.subsys.u.pci.guest_addr.domain,
-+                    detach->source.subsys.u.pci.guest_addr.bus,
-+                    detach->source.subsys.u.pci.guest_addr.slot) < 0) {
-+        virReportOOMError(conn);
-+        return -1;
-+    }
-+
-+    if (qemudMonitorCommand(vm, cmd, &reply) < 0) {
-+        qemudReportError(conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
-+                         "%s", _("cannot detach host pci device"));
-+        VIR_FREE(cmd);
-+        return -1;
-+    }
-+
-+    DEBUG("%s: pci_del reply: %s", vm->def->name,  reply);
-+
-+    /* If the command fails due to a wrong PCI address qemu prints
-+     * 'invalid pci address'; nothing is printed on success */
-+    if (strstr(reply, "Invalid pci address")) {
-+        qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
-+                         _("failed to detach host pci device: invalid PCI address %.4x:%.2x:%.2x: %s"),
-+                         detach->source.subsys.u.pci.guest_addr.domain,
-+                         detach->source.subsys.u.pci.guest_addr.bus,
-+                         detach->source.subsys.u.pci.guest_addr.slot,
-+                         reply);
-+        VIR_FREE(reply);
-+        VIR_FREE(cmd);
-+        return -1;
-+    }
-+
-+    VIR_FREE(reply);
-+    VIR_FREE(cmd);
-+
-+    ret = 0;
-+
-+    pci = pciGetDevice(conn,
-+                       detach->source.subsys.u.pci.domain,
-+                       detach->source.subsys.u.pci.bus,
-+                       detach->source.subsys.u.pci.slot,
-+                       detach->source.subsys.u.pci.function);
-+    if (!pci)
-+        ret = -1;
-+    else {
-+        pciDeviceListDel(conn, driver->activePciHostdevs, pci);
-+        if (pciResetDevice(conn, pci, driver->activePciHostdevs) < 0)
-+            ret = -1;
-+        if (detach->managed && pciReAttachDevice(conn, pci) < 0)
-+            ret = -1;
-+        pciFreeDevice(conn, pci);
-+    }
-+
-+    if (i != --vm->def->nhostdevs)
-+        memmove(&vm->def->hostdevs[i],
-+                &vm->def->hostdevs[i+1],
-+                sizeof(*vm->def->hostdevs) * (vm->def->nhostdevs-i));
-+    if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs) < 0) {
-+        virReportOOMError(conn);
-+        ret = -1;
-+    }
-+
-+    return ret;
-+}
-+
-+static int qemudDomainDetachHostDevice(virConnectPtr conn,
-+                                       struct qemud_driver *driver,
-+                                       virDomainObjPtr vm,
-+                                       virDomainDeviceDefPtr dev)
-+{
-+    virDomainHostdevDefPtr hostdev = dev->data.hostdev;
-+    int ret;
-+
-+    if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) {
-+        qemudReportError(conn, dom, NULL, VIR_ERR_NO_SUPPORT,
-+                         _("hostdev mode '%s' not supported"),
-+                         virDomainHostdevModeTypeToString(hostdev->mode));
-+        return -1;
-+    }
-+
-+    switch (hostdev->source.subsys.type) {
-+    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
-+        ret = qemudDomainDetachHostPciDevice(conn, driver, vm, dev);
-+        break;
-+    default:
-+        qemudReportError(conn, dom, NULL, VIR_ERR_NO_SUPPORT,
-+                         _("hostdev subsys type '%s' not supported"),
-+                         virDomainHostdevSubsysTypeToString(hostdev->source.subsys.type));
-+        return -1;
-+    }
-+
-+    if (qemuDomainSetDeviceOwnership(conn, driver, dev, 1) < 0)
-+        VIR_WARN0("Fail to restore disk device ownership");
-+
-+    return ret;
-+}
-+
- static int qemudDomainDetachDevice(virDomainPtr dom,
-                                    const char *xml) {
-     struct qemud_driver *driver = dom->conn->privateData;
-@@ -5670,6 +5914,8 @@ static int qemudDomainDetachDevice(virDomainPtr dom,
-             VIR_WARN0("Fail to restore disk device ownership");
-     } else if (dev->type == VIR_DOMAIN_DEVICE_NET) {
-         ret = qemudDomainDetachNetDevice(dom->conn, vm, dev);
-+    } else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) {
-+        ret = qemudDomainDetachHostDevice(dom->conn, driver, vm, dev);
-     } else
-         qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_SUPPORT,
-                          "%s", _("only SCSI or virtio disk device can be detached dynamically"));
-- 
-1.6.2.5
-
@@ -1,43 +0,0 @@
-From 100eb35a80932cd9a162c38ecd2ab8b01894fb61 Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Mon, 17 Aug 2009 15:05:22 +0100
-Subject: [PATCH] Cosmetic change to 'virsh nodedev-list --tree' output
-
-Maybe it's just me, but I try to select an item from the tree using
-double-click and get annoyed when "+-" gets included in the selection.
-
-* src/virsh.c: add a space between "+-" and the node device name
-  in 'virsh nodedev-list --tree'
-
-(cherry picked from commit 097c818bf00b3777778ffc32fea3a6ed1e741e2b)
-
-Fedora-patch: libvirt-add-space-to-nodedev-list-tree.patch
---
- src/virsh.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/src/virsh.c b/src/virsh.c
-index 94c3c4e..2d0cf81 100644
--- a/src/virsh.c
-+++ b/src/virsh.c
-@@ -5370,6 +5370,8 @@ cmdNodeListDevicesPrint(vshControl *ctl,
-     if (depth && depth < MAX_DEPTH) {
-         indentBuf[indentIdx] = '+';
-         indentBuf[indentIdx+1] = '-';
-+        indentBuf[indentIdx+2] = ' ';
-+        indentBuf[indentIdx+3] = '\0';
-     }
- 
-     /* Print this device */
-@@ -5398,7 +5400,7 @@ cmdNodeListDevicesPrint(vshControl *ctl,
-     /* If there is a child device, then print another blank line */
-     if (nextlastdev != -1) {
-         vshPrint(ctl, "%s", indentBuf);
-        vshPrint(ctl, "  |\n");
-+        vshPrint(ctl, " |\n");
-     }
- 
-     /* Finally print all children */
-- 
-1.6.2.5
-
@@ -1,812 +0,0 @@
-From 89eefbd116ae74c3a5cfcfc74a31a40b83c726c3 Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Mon, 17 Aug 2009 15:05:23 +0100
-Subject: [PATCH] Maintain a list of active PCI hostdevs and use it in pciResetDevice()
-
-https://bugzilla.redhat.com/499678
-
-First we add a pciDeviceList type and add a qemuGetPciHostDeviceList()
-function to build a list from a domain definition. Use this in
-prepare/re-attach to simplify things and eliminate the multiple
-pciGetDevice() calls.
-
-Then, as we start/shutdown guests we can add or delete devices as
-appropriate from a list of active devices.
-
-Finally, in pciReset(), we can use this to determine whether its safe to
-reset a device as a side effect of resetting another device.
-
-(cherry picked from commit 78675b228b76a83f83d64856bfb63b9e14c103a0)
-(cherry picked from commit e8ad33931296c67de0538e78d12e21706a826d37)
-
-Fedora-patch: libvirt-allow-pci-hostdev-reset-to-reset-other-devices.patch
---
- src/libvirt_private.syms |    7 +-
- src/pci.c                |  211 +++++++++++++++++++++++++++++++++--------
- src/pci.h                |   23 +++++-
- src/qemu_conf.h          |    3 +
- src/qemu_driver.c        |  237 +++++++++++++++++++++++++++-------------------
- src/xen_unified.c        |    2 +-
- 6 files changed, 339 insertions(+), 144 deletions(-)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index bd63692..4f1b01f 100644
--- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -278,7 +278,12 @@ pciFreeDevice;
- pciDettachDevice;
- pciReAttachDevice;
- pciResetDevice;
-
-+pciDeviceSetManaged;
-+pciDeviceGetManaged;
-+pciDeviceListNew;
-+pciDeviceListFree;
-+pciDeviceListAdd;
-+pciDeviceListDel;
- 
- # qparams.h
- qparam_get_query;
-diff --git a/src/pci.c b/src/pci.c
-index 74f7ef0..96e5d6d 100644
--- a/src/pci.c
-+++ b/src/pci.c
-@@ -63,6 +63,7 @@ struct _pciDevice {
-     unsigned      pci_pm_cap_pos;
-     unsigned      has_flr : 1;
-     unsigned      has_pm_reset : 1;
-+    unsigned      managed : 1;
- };
- 
- /* For virReportOOMError()  and virReportSystemError() */
-@@ -225,7 +226,7 @@ pciWrite32(pciDevice *dev, unsigned pos, uint32_t val)
-     pciWrite(dev, pos, &buf[0], sizeof(buf));
- }
- 
-typedef int (*pciIterPredicate)(pciDevice *, pciDevice *);
-+typedef int (*pciIterPredicate)(pciDevice *, pciDevice *, void *);
- 
- /* Iterate over available PCI devices calling @predicate
-  * to compare each one to @dev.
-@@ -236,7 +237,8 @@ static int
- pciIterDevices(virConnectPtr conn,
-                pciIterPredicate predicate,
-                pciDevice *dev,
-               pciDevice **matched)
-+               pciDevice **matched,
-+               void *data)
- {
-     DIR *dir;
-     struct dirent *entry;
-@@ -254,7 +256,7 @@ pciIterDevices(virConnectPtr conn,
- 
-     while ((entry = readdir(dir))) {
-         unsigned domain, bus, slot, function;
-        pciDevice *try;
-+        pciDevice *check;
- 
-         /* Ignore '.' and '..' */
-         if (entry->d_name[0] == '.')
-@@ -266,18 +268,18 @@ pciIterDevices(virConnectPtr conn,
-             continue;
-         }
- 
-        try = pciGetDevice(conn, domain, bus, slot, function);
-        if (!try) {
-+        check = pciGetDevice(conn, domain, bus, slot, function);
-+        if (!check) {
-             ret = -1;
-             break;
-         }
- 
-        if (predicate(try, dev)) {
-            VIR_DEBUG("%s %s: iter matched on %s", dev->id, dev->name, try->name);
-            *matched = try;
-+        if (predicate(dev, check, data)) {
-+            VIR_DEBUG("%s %s: iter matched on %s", dev->id, dev->name, check->name);
-+            *matched = check;
-             break;
-         }
-        pciFreeDevice(conn, try);
-+        pciFreeDevice(conn, check);
-     }
-     closedir(dir);
-     return ret;
-@@ -379,63 +381,70 @@ pciDetectPowerManagementReset(pciDevice *dev)
-     return 0;
- }
- 
-/* Any devices other than the one supplied on the same domain/bus ? */
-+/* Any active devices other than the one supplied on the same domain/bus ? */
- static int
-pciSharesBus(pciDevice *a, pciDevice *b)
-+pciSharesBusWithActive(pciDevice *dev, pciDevice *check, void *data)
- {
-    return
-        a->domain == b->domain &&
-        a->bus == b->bus &&
-        (a->slot != b->slot ||
-         a->function != b->function);
-}
-+    pciDeviceList *activeDevs = data;
- 
-static int
-pciBusContainsOtherDevices(virConnectPtr conn, pciDevice *dev)
-{
-    pciDevice *matched = NULL;
-    if (pciIterDevices(conn, pciSharesBus, dev, &matched) < 0)
-        return 1;
-    if (!matched)
-+    if (dev->domain != check->domain ||
-+        dev->bus != check->bus ||
-+        (check->slot == check->slot &&
-+         check->function == check->function))
-+        return 0;
-+
-+    if (activeDevs && !pciDeviceListFind(activeDevs, check))
-         return 0;
-    pciFreeDevice(conn, matched);
-+
-     return 1;
- }
- 
-/* Is @a the parent of @b ? */
-+static pciDevice *
-+pciBusContainsActiveDevices(virConnectPtr conn,
-+                            pciDevice *dev,
-+                            pciDeviceList *activeDevs)
-+{
-+    pciDevice *active = NULL;
-+    if (pciIterDevices(conn, pciSharesBusWithActive,
-+                       dev, &active, activeDevs) < 0)
-+        return NULL;
-+    return active;
-+}
-+
-+/* Is @check the parent of @dev ? */
- static int
-pciIsParent(pciDevice *a, pciDevice *b)
-+pciIsParent(pciDevice *dev, pciDevice *check, void *data ATTRIBUTE_UNUSED)
- {
-     uint16_t device_class;
-     uint8_t header_type, secondary, subordinate;
- 
-    if (a->domain != b->domain)
-+    if (dev->domain != check->domain)
-         return 0;
- 
-     /* Is it a bridge? */
-    device_class = pciRead16(a, PCI_CLASS_DEVICE);
-+    device_class = pciRead16(check, PCI_CLASS_DEVICE);
-     if (device_class != PCI_CLASS_BRIDGE_PCI)
-         return 0;
- 
-     /* Is it a plane? */
-    header_type = pciRead8(a, PCI_HEADER_TYPE);
-+    header_type = pciRead8(check, PCI_HEADER_TYPE);
-     if ((header_type & PCI_HEADER_TYPE_MASK) != PCI_HEADER_TYPE_BRIDGE)
-         return 0;
- 
-    secondary   = pciRead8(a, PCI_SECONDARY_BUS);
-    subordinate = pciRead8(a, PCI_SUBORDINATE_BUS);
-+    secondary   = pciRead8(check, PCI_SECONDARY_BUS);
-+    subordinate = pciRead8(check, PCI_SUBORDINATE_BUS);
- 
-    VIR_DEBUG("%s %s: found parent device %s\n", b->id, b->name, a->name);
-+    VIR_DEBUG("%s %s: found parent device %s\n", dev->id, dev->name, check->name);
- 
-     /* No, it's superman! */
-    return (b->bus >= secondary && b->bus <= subordinate);
-+    return (dev->bus >= secondary && dev->bus <= subordinate);
- }
- 
- static pciDevice *
- pciGetParentDevice(virConnectPtr conn, pciDevice *dev)
- {
-     pciDevice *parent = NULL;
-    pciIterDevices(conn, pciIsParent, dev, &parent);
-+    pciIterDevices(conn, pciIsParent, dev, &parent, NULL);
-     return parent;
- }
- 
-@@ -443,9 +452,11 @@ pciGetParentDevice(virConnectPtr conn, pciDevice *dev)
-  * devices behind a bus.
-  */
- static int
-pciTrySecondaryBusReset(virConnectPtr conn, pciDevice *dev)
-+pciTrySecondaryBusReset(virConnectPtr conn,
-+                        pciDevice *dev,
-+                        pciDeviceList *activeDevs)
- {
-    pciDevice *parent;
-+    pciDevice *parent, *conflict;
-     uint8_t config_space[PCI_CONF_LEN];
-     uint16_t ctl;
-     int ret = -1;
-@@ -455,10 +466,10 @@ pciTrySecondaryBusReset(virConnectPtr conn, pciDevice *dev)
-      * In future, we could allow it so long as those devices
-      * are not in use by the host or other guests.
-      */
-    if (pciBusContainsOtherDevices(conn, dev)) {
-+    if ((conflict = pciBusContainsActiveDevices(conn, dev, activeDevs))) {
-         pciReportError(conn, VIR_ERR_NO_SUPPORT,
-                       _("Other devices on bus with %s, not doing bus reset"),
-                       dev->name);
-+                       _("Active %s devices on bus with %s, not doing bus reset"),
-+                       conflict->name, dev->name);
-         return -1;
-     }
- 
-@@ -572,10 +583,18 @@ pciInitDevice(virConnectPtr conn, pciDevice *dev)
- }
- 
- int
-pciResetDevice(virConnectPtr conn, pciDevice *dev)
-+pciResetDevice(virConnectPtr conn,
-+               pciDevice *dev,
-+               pciDeviceList *activeDevs)
- {
-     int ret = -1;
- 
-+    if (activeDevs && pciDeviceListFind(activeDevs, dev)) {
-+        pciReportError(conn, VIR_ERR_INTERNAL_ERROR,
-+                       _("Not resetting active device %s"), dev->name);
-+        return -1;
-+    }
-+
-     if (!dev->initted && pciInitDevice(conn, dev) < 0)
-         return -1;
- 
-@@ -594,7 +613,7 @@ pciResetDevice(virConnectPtr conn, pciDevice *dev)
- 
-     /* Bus reset is not an option with the root bus */
-     if (ret < 0 && dev->bus != 0)
-        ret = pciTrySecondaryBusReset(conn, dev);
-+        ret = pciTrySecondaryBusReset(conn, dev, activeDevs);
- 
-     if (ret < 0) {
-         virErrorPtr err = virGetLastError();
-@@ -890,8 +909,116 @@ pciGetDevice(virConnectPtr conn,
- void
- pciFreeDevice(virConnectPtr conn ATTRIBUTE_UNUSED, pciDevice *dev)
- {
-+    if (!dev)
-+        return;
-     VIR_DEBUG("%s %s: freeing", dev->id, dev->name);
-     if (dev->fd >= 0)
-         close(dev->fd);
-     VIR_FREE(dev);
- }
-+
-+void pciDeviceSetManaged(pciDevice *dev, unsigned managed)
-+{
-+    dev->managed = !!managed;
-+}
-+
-+unsigned pciDeviceGetManaged(pciDevice *dev)
-+{
-+    return dev->managed;
-+}
-+
-+pciDeviceList *
-+pciDeviceListNew(virConnectPtr conn)
-+{
-+    pciDeviceList *list;
-+
-+    if (VIR_ALLOC(list) < 0) {
-+        virReportOOMError(conn);
-+        return NULL;
-+    }
-+
-+    return list;
-+}
-+
-+void
-+pciDeviceListFree(virConnectPtr conn,
-+                  pciDeviceList *list)
-+{
-+    int i;
-+
-+    if (!list)
-+        return;
-+
-+    for (i = 0; i < list->count; i++) {
-+        pciFreeDevice(conn, list->devs[i]);
-+        list->devs[i] = NULL;
-+    }
-+
-+    list->count = 0;
-+    VIR_FREE(list->devs);
-+    VIR_FREE(list);
-+}
-+
-+int
-+pciDeviceListAdd(virConnectPtr conn,
-+                 pciDeviceList *list,
-+                 pciDevice *dev)
-+{
-+    if (pciDeviceListFind(list, dev)) {
-+        pciReportError(conn, VIR_ERR_INTERNAL_ERROR,
-+                       _("Device %s is already in use"), dev->name);
-+        return -1;
-+    }
-+
-+    if (VIR_REALLOC_N(list->devs, list->count+1) < 0) {
-+        virReportOOMError(conn);
-+        return -1;
-+    }
-+
-+    list->devs[list->count++] = dev;
-+
-+    return 0;
-+}
-+
-+void
-+pciDeviceListDel(virConnectPtr conn ATTRIBUTE_UNUSED,
-+                 pciDeviceList *list,
-+                 pciDevice *dev)
-+{
-+    int i;
-+
-+    for (i = 0; i < list->count; i++) {
-+        if (list->devs[i]->domain   != dev->domain ||
-+            list->devs[i]->bus      != dev->bus    ||
-+            list->devs[i]->slot     != dev->slot   ||
-+            list->devs[i]->function != dev->function)
-+            continue;
-+
-+        pciFreeDevice(conn, list->devs[i]);
-+
-+        if (i != --list->count)
-+            memmove(&list->devs[i],
-+                    &list->devs[i+1],
-+                    sizeof(*list->devs) * (list->count-i));
-+
-+        if (VIR_REALLOC_N(list->devs, list->count) < 0) {
-+            ; /* not fatal */
-+        }
-+
-+        break;
-+    }
-+}
-+
-+pciDevice *
-+pciDeviceListFind(pciDeviceList *list, pciDevice *dev)
-+{
-+    int i;
-+
-+    for (i = 0; i < list->count; i++)
-+        if (list->devs[i]->domain   == dev->domain &&
-+            list->devs[i]->bus      == dev->bus    &&
-+            list->devs[i]->slot     == dev->slot   &&
-+            list->devs[i]->function == dev->function)
-+            return list->devs[i];
-+    return NULL;
-+}
-diff --git a/src/pci.h b/src/pci.h
-index 47882ef..685b0af 100644
--- a/src/pci.h
-+++ b/src/pci.h
-@@ -27,6 +27,11 @@
- 
- typedef struct _pciDevice pciDevice;
- 
-+typedef struct {
-+    unsigned count;
-+    pciDevice **devs;
-+} pciDeviceList;
-+
- pciDevice *pciGetDevice      (virConnectPtr  conn,
-                               unsigned       domain,
-                               unsigned       bus,
-@@ -39,6 +44,22 @@ int        pciDettachDevice  (virConnectPtr  conn,
- int        pciReAttachDevice (virConnectPtr  conn,
-                               pciDevice     *dev);
- int        pciResetDevice    (virConnectPtr  conn,
-                              pciDevice     *dev);
-+                              pciDevice     *dev,
-+                              pciDeviceList *activeDevs);
-+void      pciDeviceSetManaged(pciDevice     *dev,
-+                              unsigned       managed);
-+unsigned  pciDeviceGetManaged(pciDevice     *dev);
-+
-+pciDeviceList *pciDeviceListNew  (virConnectPtr conn);
-+void           pciDeviceListFree (virConnectPtr conn,
-+                                  pciDeviceList *list);
-+int            pciDeviceListAdd  (virConnectPtr conn,
-+                                  pciDeviceList *list,
-+                                  pciDevice *dev);
-+void           pciDeviceListDel  (virConnectPtr conn,
-+                                  pciDeviceList *list,
-+                                  pciDevice *dev);
-+pciDevice *    pciDeviceListFind (pciDeviceList *list,
-+                                  pciDevice *dev);
- 
- #endif /* __VIR_PCI_H__ */
-diff --git a/src/qemu_conf.h b/src/qemu_conf.h
-index 517626a..ab9d5e1 100644
--- a/src/qemu_conf.h
-+++ b/src/qemu_conf.h
-@@ -35,6 +35,7 @@
- #include "threads.h"
- #include "security.h"
- #include "cgroup.h"
-+#include "pci.h"
- 
- #define qemudDebug(fmt, ...) do {} while(0)
- 
-@@ -107,6 +108,8 @@ struct qemud_driver {
- 
-     char *securityDriverName;
-     virSecurityDriverPtr securityDriver;
-+
-+    pciDeviceList *activePciHostdevs;
- };
- 
- 
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index fd39fc2..cbc27c4 100644
--- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -128,6 +128,9 @@ static int qemudDomainSetMemoryBalloon(virConnectPtr conn,
- static int qemudDetectVcpuPIDs(virConnectPtr conn,
-                                virDomainObjPtr vm);
- 
-+static int qemuUpdateActivePciHostdevs(struct qemud_driver *driver,
-+                                       virDomainDefPtr def);
-+
- static struct qemud_driver *qemu_driver = NULL;
- 
- static int qemuCgroupControllerActive(struct qemud_driver *driver,
-@@ -320,6 +323,10 @@ qemuReconnectDomain(struct qemud_driver *driver,
-         goto error;
-     }
- 
-+    if (qemuUpdateActivePciHostdevs(driver, obj->def) < 0) {
-+        goto error;
-+    }
-+
-     if (obj->def->seclabel.type == VIR_DOMAIN_SECLABEL_DYNAMIC &&
-         driver->securityDriver &&
-         driver->securityDriver->domainReserveSecurityLabel &&
-@@ -524,6 +531,9 @@ qemudStartup(int privileged) {
-     if ((qemu_driver->caps = qemudCapsInit(NULL)) == NULL)
-         goto out_of_memory;
- 
-+    if ((qemu_driver->activePciHostdevs = pciDeviceListNew(NULL)) == NULL)
-+        goto error;
-+
-     if (qemudLoadDriverConfig(qemu_driver, driverConf) < 0) {
-         goto error;
-     }
-@@ -648,6 +658,7 @@ qemudShutdown(void) {
-         return -1;
- 
-     qemuDriverLock(qemu_driver);
-+    pciDeviceListFree(NULL, qemu_driver->activePciHostdevs);
-     virCapabilitiesFree(qemu_driver->caps);
- 
-     virDomainObjListFree(&qemu_driver->domains);
-@@ -1329,48 +1340,16 @@ static int qemudNextFreeVNCPort(struct qemud_driver *driver ATTRIBUTE_UNUSED) {
-     return -1;
- }
- 
-static int qemuPrepareHostDevices(virConnectPtr conn,
-                                  virDomainDefPtr def) {
-+static pciDeviceList *
-+qemuGetPciHostDeviceList(virConnectPtr conn,
-+                         virDomainDefPtr def)
-+{
-+    pciDeviceList *list;
-     int i;
- 
-    /* We have to use 2 loops here. *All* devices must
-     * be detached before we reset any of them, because
-     * in some cases you have to reset the whole PCI,
-     * which impacts all devices on it
-     */
-
-    for (i = 0 ; i < def->nhostdevs ; i++) {
-        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
-
-        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
-            continue;
-        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
-            continue;
-
-        if (hostdev->managed) {
-            pciDevice *dev = pciGetDevice(conn,
-                                          hostdev->source.subsys.u.pci.domain,
-                                          hostdev->source.subsys.u.pci.bus,
-                                          hostdev->source.subsys.u.pci.slot,
-                                          hostdev->source.subsys.u.pci.function);
-            if (!dev)
-                goto error;
-
-            if (pciDettachDevice(conn, dev) < 0) {
-                pciFreeDevice(conn, dev);
-                goto error;
-            }
-
-            pciFreeDevice(conn, dev);
-        } /* else {
-             XXX validate that non-managed device isn't in use, eg
-             by checking that device is either un-bound, or bound
-             to pci-stub.ko
-        } */
-    }
-+    if (!(list = pciDeviceListNew(conn)))
-+        return NULL;
- 
-    /* Now that all the PCI hostdevs have be dettached, we can safely
-     * reset them */
-     for (i = 0 ; i < def->nhostdevs ; i++) {
-         virDomainHostdevDefPtr hostdev = def->hostdevs[i];
-         pciDevice *dev;
-@@ -1385,95 +1364,151 @@ static int qemuPrepareHostDevices(virConnectPtr conn,
-                            hostdev->source.subsys.u.pci.bus,
-                            hostdev->source.subsys.u.pci.slot,
-                            hostdev->source.subsys.u.pci.function);
-        if (!dev)
-            goto error;
-+        if (!dev) {
-+            pciDeviceListFree(conn, list);
-+            return NULL;
-+        }
- 
-        if (pciResetDevice(conn, dev) < 0) {
-+        if (pciDeviceListAdd(conn, list, dev) < 0) {
-             pciFreeDevice(conn, dev);
-            goto error;
-+            pciDeviceListFree(conn, list);
-+            return NULL;
-         }
- 
-        pciFreeDevice(conn, dev);
-+        pciDeviceSetManaged(dev, hostdev->managed);
-     }
- 
-    return 0;
-+    return list;
-+}
- 
-error:
-    return -1;
-+static int
-+qemuUpdateActivePciHostdevs(struct qemud_driver *driver,
-+                            virDomainDefPtr def)
-+{
-+    pciDeviceList *pcidevs;
-+    int i, ret;
-+
-+    if (!def->nhostdevs)
-+        return 0;
-+
-+    if (!(pcidevs = qemuGetPciHostDeviceList(NULL, def)))
-+        return -1;
-+
-+    ret = 0;
-+
-+    for (i = 0; i < pcidevs->count; i++) {
-+        if (pciDeviceListAdd(NULL,
-+                             driver->activePciHostdevs,
-+                             pcidevs->devs[i]) < 0) {
-+            ret = -1;
-+            break;
-+        }
-+        pcidevs->devs[i] = NULL;
-+    }
-+
-+    pciDeviceListFree(NULL, pcidevs);
-+    return ret;
- }
- 
-static void
-qemuDomainReAttachHostDevices(virConnectPtr conn, virDomainDefPtr def)
-+static int
-+qemuPrepareHostDevices(virConnectPtr conn,
-+                       struct qemud_driver *driver,
-+                       virDomainDefPtr def)
- {
-+    pciDeviceList *pcidevs;
-     int i;
- 
-    /* Again 2 loops; reset all the devices before re-attach */
-+    if (!def->nhostdevs)
-+        return 0;
- 
-    for (i = 0 ; i < def->nhostdevs ; i++) {
-        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
-        pciDevice *dev;
-+    if (!(pcidevs = qemuGetPciHostDeviceList(conn, def)))
-+        return -1;
- 
-        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
-            continue;
-        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
-            continue;
-+    /* We have to use 3 loops here. *All* devices must
-+     * be detached before we reset any of them, because
-+     * in some cases you have to reset the whole PCI,
-+     * which impacts all devices on it. Also, all devices
-+     * must be reset before being marked as active.
-+     */
- 
-        dev = pciGetDevice(conn,
-                           hostdev->source.subsys.u.pci.domain,
-                           hostdev->source.subsys.u.pci.bus,
-                           hostdev->source.subsys.u.pci.slot,
-                           hostdev->source.subsys.u.pci.function);
-        if (!dev) {
-            virErrorPtr err = virGetLastError();
-            VIR_ERROR(_("Failed to allocate pciDevice: %s\n"),
-                      err ? err->message : "");
-            virResetError(err);
-            continue;
-        }
-+    /* XXX validate that non-managed device isn't in use, eg
-+     * by checking that device is either un-bound, or bound
-+     * to pci-stub.ko
-+     */
- 
-        if (pciResetDevice(conn, dev) < 0) {
-            virErrorPtr err = virGetLastError();
-            VIR_ERROR(_("Failed to reset PCI device: %s\n"),
-                      err ? err->message : "");
-            virResetError(err);
-        }
-+    for (i = 0; i < pcidevs->count; i++)
-+        if (pciDeviceGetManaged(pcidevs->devs[i]) &&
-+            pciDettachDevice(conn, pcidevs->devs[i]) < 0)
-+            goto error;
-+
-+    /* Now that all the PCI hostdevs have be dettached, we can safely
-+     * reset them */
-+    for (i = 0; i < pcidevs->count; i++)
-+        if (pciResetDevice(conn, pcidevs->devs[i],
-+                           driver->activePciHostdevs) < 0)
-+            goto error;
- 
-        pciFreeDevice(conn, dev);
-+    /* Now mark all the devices as active */
-+    for (i = 0; i < pcidevs->count; i++) {
-+        if (pciDeviceListAdd(conn,
-+                             driver->activePciHostdevs,
-+                             pcidevs->devs[i]) < 0)
-+            goto error;
-+        pcidevs->devs[i] = NULL;
-     }
- 
-    for (i = 0 ; i < def->nhostdevs ; i++) {
-        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
-        pciDevice *dev;
-+    pciDeviceListFree(conn, pcidevs);
-+    return 0;
- 
-        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
-            continue;
-        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
-            continue;
-        if (!hostdev->managed)
-            continue;
-+error:
-+    pciDeviceListFree(conn, pcidevs);
-+    return -1;
-+}
- 
-        dev = pciGetDevice(conn,
-                           hostdev->source.subsys.u.pci.domain,
-                           hostdev->source.subsys.u.pci.bus,
-                           hostdev->source.subsys.u.pci.slot,
-                           hostdev->source.subsys.u.pci.function);
-        if (!dev) {
-+static void
-+qemuDomainReAttachHostDevices(virConnectPtr conn,
-+                              struct qemud_driver *driver,
-+                              virDomainDefPtr def)
-+{
-+    pciDeviceList *pcidevs;
-+    int i;
-+
-+    if (!def->nhostdevs)
-+        return;
-+
-+    if (!(pcidevs = qemuGetPciHostDeviceList(conn, def))) {
-+        virErrorPtr err = virGetLastError();
-+        VIR_ERROR(_("Failed to allocate pciDeviceList: %s\n"),
-+                  err ? err->message : "");
-+        virResetError(err);
-+        return;
-+    }
-+
-+    /* Again 3 loops; mark all devices as inactive before reset
-+     * them and reset all the devices before re-attach */
-+
-+    for (i = 0; i < pcidevs->count; i++)
-+        pciDeviceListDel(conn, driver->activePciHostdevs, pcidevs->devs[i]);
-+
-+    for (i = 0; i < pcidevs->count; i++)
-+        if (pciResetDevice(conn, pcidevs->devs[i],
-+                           driver->activePciHostdevs) < 0) {
-             virErrorPtr err = virGetLastError();
-            VIR_ERROR(_("Failed to allocate pciDevice: %s\n"),
-+            VIR_ERROR(_("Failed to reset PCI device: %s\n"),
-                       err ? err->message : "");
-             virResetError(err);
-            continue;
-         }
- 
-        if (pciReAttachDevice(conn, dev) < 0) {
-+    for (i = 0; i < pcidevs->count; i++)
-+        if (pciDeviceGetManaged(pcidevs->devs[i]) &&
-+            pciReAttachDevice(conn, pcidevs->devs[i]) < 0) {
-             virErrorPtr err = virGetLastError();
-             VIR_ERROR(_("Failed to re-attach PCI device: %s\n"),
-                       err ? err->message : "");
-             virResetError(err);
-         }
- 
-        pciFreeDevice(conn, dev);
-    }
-+    pciDeviceListFree(conn, pcidevs);
- }
- 
- static const char *const defaultDeviceACL[] = {
-@@ -2001,7 +2036,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-     if (qemuSetupCgroup(conn, driver, vm) < 0)
-         goto cleanup;
- 
-    if (qemuPrepareHostDevices(conn, vm->def) < 0)
-+    if (qemuPrepareHostDevices(conn, driver, vm->def) < 0)
-         goto cleanup;
- 
-     if (VIR_ALLOC(vm->monitor_chr) < 0) {
-@@ -2183,7 +2218,7 @@ static void qemudShutdownVMDaemon(virConnectPtr conn,
-         VIR_WARN("Failed to restore all device ownership for %s",
-                  vm->def->name);
- 
-    qemuDomainReAttachHostDevices(conn, vm->def);
-+    qemuDomainReAttachHostDevices(conn, driver, vm->def);
- 
- retry:
-     if ((ret = qemuRemoveCgroup(conn, driver, vm)) < 0) {
-@@ -6791,6 +6826,7 @@ out:
- static int
- qemudNodeDeviceReset (virNodeDevicePtr dev)
- {
-+    struct qemud_driver *driver = dev->conn->privateData;
-     pciDevice *pci;
-     unsigned domain, bus, slot, function;
-     int ret = -1;
-@@ -6802,11 +6838,14 @@ qemudNodeDeviceReset (virNodeDevicePtr dev)
-     if (!pci)
-         return -1;
- 
-    if (pciResetDevice(dev->conn, pci) < 0)
-+    qemuDriverLock(driver);
-+
-+    if (pciResetDevice(dev->conn, pci, driver->activePciHostdevs) < 0)
-         goto out;
- 
-     ret = 0;
- out:
-+    qemuDriverUnlock(driver);
-     pciFreeDevice(dev->conn, pci);
-     return ret;
- }
-diff --git a/src/xen_unified.c b/src/xen_unified.c
-index f2ffc25..dfa9ca5 100644
--- a/src/xen_unified.c
-+++ b/src/xen_unified.c
-@@ -1641,7 +1641,7 @@ xenUnifiedNodeDeviceReset (virNodeDevicePtr dev)
-     if (!pci)
-         return -1;
- 
-    if (pciResetDevice(dev->conn, pci) < 0)
-+    if (pciResetDevice(dev->conn, pci, NULL) < 0)
-         goto out;
- 
-     ret = 0;
-- 
-1.6.2.5
-
@@ -1,121 +0,0 @@
-From 5aad00b08cadc4d9da8bffd3d255ffaac98d36dd Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Fri, 14 Aug 2009 08:31:11 +0100
-Subject: [PATCH] Allow PM reset on multi-function PCI devices
-
-https://bugzilla.redhat.com/515689
-
-It turns out that a PCI Power Management reset only affects individual
-functions, and not the whole device.
-
-The PCI Power Management spec talks about resetting the 'device' rather
-than the 'function', but Intel's Dexuan Cui informs me that it is
-actually a per-function reset.
-
-Also, Yu Zhao has added pci_pm_reset() to the kernel, and it doesn't
-reject multi-function devices, so it must be true! :-)
-
-(A side issue is that we could defer the PM reset to the kernel if we
-could detect that the kernel has PM reset support, but barring version
-number checks we don't have a way to detect that support)
-
-* src/pci.c: remove the pciDeviceContainsOtherFunctions() check from
-  pciTryPowerManagementReset() and prefer PM reset over bus reset
-  where both are available
-
-Cc: Cui, Dexuan <dexuan.cui@intel.com>
-Cc: Yu Zhao <yu.zhao@intel.com>
-
-(cherry picked from commit 64a6682b93a2a8aa38067a43979c9eaf993d2b41)
-
-Fedora-patch: libvirt-allow-pm-reset-on-multi-function-pci-devices.patch
---
- src/pci.c |   48 +++++++++---------------------------------------
- 1 files changed, 9 insertions(+), 39 deletions(-)
-
-diff --git a/src/pci.c b/src/pci.c
-index 2dc2e1c..11b3e8b 100644
--- a/src/pci.c
-+++ b/src/pci.c
-@@ -402,29 +402,6 @@ pciBusContainsOtherDevices(virConnectPtr conn, pciDevice *dev)
-     return 1;
- }
- 
-/* Any other functions on this device ? */
-static int
-pciSharesDevice(pciDevice *a, pciDevice *b)
-{
-    return
-        a->domain == b->domain &&
-        a->bus == b->bus &&
-        a->slot == b->slot &&
-        a->function != b->function;
-}
-
-static int
-pciDeviceContainsOtherFunctions(virConnectPtr conn, pciDevice *dev)
-{
-    pciDevice *matched = NULL;
-    if (pciIterDevices(conn, pciSharesDevice, dev, &matched) < 0)
-        return 1;
-    if (!matched)
-        return 0;
-    pciFreeDevice(conn, matched);
-    return 1;
-}
-
- /* Is @a the parent of @b ? */
- static int
- pciIsParent(pciDevice *a, pciDevice *b)
-@@ -529,7 +506,7 @@ out:
-  * above we require the device supports a full internal reset.
-  */
- static int
-pciTryPowerManagementReset(virConnectPtr conn, pciDevice *dev)
-+pciTryPowerManagementReset(virConnectPtr conn ATTRIBUTE_UNUSED, pciDevice *dev)
- {
-     uint8_t config_space[PCI_CONF_LEN];
-     uint32_t ctl;
-@@ -537,16 +514,6 @@ pciTryPowerManagementReset(virConnectPtr conn, pciDevice *dev)
-     if (!dev->pci_pm_cap_pos)
-         return -1;
- 
-    /* For now, we just refuse to do a power management reset
-     * if there are other functions on this device.
-     * In future, we could allow it so long as those functions
-     * are not in use by the host or other guests.
-     */
-    if (pciDeviceContainsOtherFunctions(conn, dev)) {
-        VIR_WARN("%s contains other functions, not resetting", dev->name);
-        return -1;
-    }
-
-     /* Save and restore the device's config space. */
-     if (pciRead(dev, 0, &config_space[0], PCI_CONF_LEN) < 0) {
-         VIR_WARN("Failed to save PCI config space for %s", dev->name);
-@@ -604,14 +571,17 @@ pciResetDevice(virConnectPtr conn, pciDevice *dev)
-     if (dev->has_flr)
-         return 0;
- 
-+    /* If the device supports PCI power management reset,
-+     * that's the next best thing because it only resets
-+     * the function, not the whole device.
-+     */
-+    if (dev->has_pm_reset)
-+        ret = pciTryPowerManagementReset(conn, dev);
-+
-     /* Bus reset is not an option with the root bus */
-    if (dev->bus != 0)
-+    if (ret < 0 && dev->bus != 0)
-         ret = pciTrySecondaryBusReset(conn, dev);
- 
-    /* Next best option is a PCI power management reset */
-    if (ret < 0 && dev->has_pm_reset)
-        ret = pciTryPowerManagementReset(conn, dev);
-
-     if (ret < 0)
-         pciReportError(conn, VIR_ERR_NO_SUPPORT,
-                        _("No PCI reset capability available for %s"),
-- 
-1.6.2.5
-
@@ -1,79 +0,0 @@
-From 165fb333c9d954fec636dc0f1917ba50417478c0 Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Sat, 15 Aug 2009 19:38:15 +0100
-Subject: [PATCH] Fix list updating after disk/network hot-unplug
-
-The current code makes a poor effort at updating the device arrays after
-hot-unplug. Fix that and combine the two code paths into one.
-
-* src/qemu_driver.c: fix list updating in qemudDomainDetachNetDevice() and
-  qemudDomainDetachPciDiskDevice()
-
-(cherry picked from commit 4e12af5623e4a962a6bb911af06fa29aa85befba)
-
-Fedora-patch: libvirt-fix-device-list-update-after-detach.patch
---
- src/qemu_driver.c |   38 ++++++++++++++++++--------------------
- 1 files changed, 18 insertions(+), 20 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index bd58435..2c4fd6f 100644
--- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -5404,18 +5404,17 @@ try_command:
-         goto cleanup;
-     }
- 
-    if (vm->def->ndisks > 1) {
-        vm->def->disks[i] = vm->def->disks[--vm->def->ndisks];
-        if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks) < 0) {
-            virReportOOMError(conn);
-            goto cleanup;
-        }
-        qsort(vm->def->disks, vm->def->ndisks, sizeof(*vm->def->disks),
-              virDomainDiskQSort);
-    } else {
-        VIR_FREE(vm->def->disks[0]);
-        vm->def->ndisks = 0;
-+    if (i != --vm->def->ndisks)
-+        memmove(&vm->def->disks[i],
-+                &vm->def->disks[i+1],
-+                sizeof(*vm->def->disks) * (vm->def->ndisks-i));
-+    if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks) < 0) {
-+        virReportOOMError(conn);
-+        goto cleanup;
-     }
-+    qsort(vm->def->disks, vm->def->ndisks, sizeof(*vm->def->disks),
-+          virDomainDiskQSort);
-+
-     ret = 0;
- 
- cleanup:
-@@ -5503,16 +5502,15 @@ qemudDomainDetachNetDevice(virConnectPtr conn,
- 
-     DEBUG("%s: host_net_remove reply: %s", vm->def->name,  reply);
- 
-    if (vm->def->nnets > 1) {
-        vm->def->nets[i] = vm->def->nets[--vm->def->nnets];
-        if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets) < 0) {
-            virReportOOMError(conn);
-            goto cleanup;
-        }
-    } else {
-        VIR_FREE(vm->def->nets[0]);
-        vm->def->nnets = 0;
-+    if (i != --vm->def->nnets)
-+        memmove(&vm->def->nets[i],
-+                &vm->def->nets[i+1],
-+                sizeof(*vm->def->nets) * (vm->def->nnets-i));
-+    if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets) < 0) {
-+        virReportOOMError(conn);
-+        goto cleanup;
-     }
-+
-     ret = 0;
- 
- cleanup:
-- 
-1.6.2.5
-
@@ -1,45 +0,0 @@
-From f2eb2ad5163d5bae2392a8bfc6040c45426c9f5f Mon Sep 17 00:00:00 2001
-From: Chris Lalancette <clalance@redhat.com>
-Date: Wed, 5 Aug 2009 13:42:07 +0200
-Subject: [PATCH] Run 'cont' on successful migration finish.
-
-https://bugzilla.redhat.com/516187
-
-As of qemu 0.10.6, qemu now honors the -S flag on incoming migration.
-That means that when the migration completes, we have to issue a
-'cont' command to get the VM running again.  We do it unconditionally
-since it won't hurt on older qemu.
-
-(cherry picked from commit d1ec4d7a5a4f50c9492137eaab4f021caa075f95)
-
-Fedora-patch: libvirt-fix-migration-completion-with-newer-qemu.patch
---
- src/qemu_driver.c |   11 +++++++++++
- 1 files changed, 11 insertions(+), 0 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 99dac52..bf9a0b2 100644
--- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -6951,7 +6951,18 @@ qemudDomainMigrateFinish2 (virConnectPtr dconn,
-      */
-     if (retcode == 0) {
-         dom = virGetDomain (dconn, vm->def->name, vm->def->uuid);
-+
-+        /* run 'cont' on the destination, which allows migration on qemu
-+         * >= 0.10.6 to work properly.  This isn't strictly necessary on
-+         * older qemu's, but it also doesn't hurt anything there
-+         */
-+        if (qemudMonitorCommand(vm, "cont", &info) < 0) {
-+            qemudReportError(dconn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
-+                             "%s", _("resume operation failed"));
-+            goto cleanup;
-+        }
-         VIR_FREE(info);
-+
-         vm->state = VIR_DOMAIN_RUNNING;
-         event = virDomainEventNewFromObj(vm,
-                                          VIR_DOMAIN_EVENT_RESUMED,
-- 
-1.6.2.5
-
@@ -1,141 +0,0 @@
-From c8a9dbe131713de83bdc67c563c4ab149e32c489 Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Fri, 14 Aug 2009 08:31:11 +0100
-Subject: [PATCH] Improve PCI host device reset error message
-
-https://bugzilla.redhat.com/499678
-
-Currently, if we are unable to reset a PCI device we return a fairly
-generic 'No PCI reset capability available' error message.
-
-Fix that by returning an error from the individual reset messages and
-using that error to construct the higher level error mesage.
-
-* src/pci.c: set errors in pciTryPowerManagementReset() and
-  pciTrySecondaryBusReset() on failure; use those error messages
-  in pciResetDevice(), or explain that no reset support is available
-
-(cherry picked from commit ebea34185612c3b96d7d3bbd8b7c2ce6c9f4fe6f)
-
-Fedora-patch: libvirt-improve-pci-hostdev-reset-error-message.patch
---
- src/pci.c         |   44 +++++++++++++++++++++++++++++++-------------
- src/qemu_driver.c |    4 ++--
- 2 files changed, 33 insertions(+), 15 deletions(-)
-
-diff --git a/src/pci.c b/src/pci.c
-index 11b3e8b..74f7ef0 100644
--- a/src/pci.c
-+++ b/src/pci.c
-@@ -456,15 +456,18 @@ pciTrySecondaryBusReset(virConnectPtr conn, pciDevice *dev)
-      * are not in use by the host or other guests.
-      */
-     if (pciBusContainsOtherDevices(conn, dev)) {
-        VIR_WARN("Other devices on bus with %s, not doing bus reset",
-                 dev->name);
-+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
-+                       _("Other devices on bus with %s, not doing bus reset"),
-+                       dev->name);
-         return -1;
-     }
- 
-     /* Find the parent bus */
-     parent = pciGetParentDevice(conn, dev);
-     if (!parent) {
-        VIR_WARN("Failed to find parent device for %s", dev->name);
-+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
-+                       _("Failed to find parent device for %s"),
-+                       dev->name);
-         return -1;
-     }
- 
-@@ -475,7 +478,9 @@ pciTrySecondaryBusReset(virConnectPtr conn, pciDevice *dev)
-      * are multiple devices/functions
-      */
-     if (pciRead(dev, 0, config_space, PCI_CONF_LEN) < 0) {
-        VIR_WARN("Failed to save PCI config space for %s", dev->name);
-+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
-+                       _("Failed to save PCI config space for %s"),
-+                       dev->name);
-         goto out;
-     }
- 
-@@ -492,9 +497,12 @@ pciTrySecondaryBusReset(virConnectPtr conn, pciDevice *dev)
- 
-     usleep(200 * 1000); /* sleep 200ms */
- 
-    if (pciWrite(dev, 0, config_space, PCI_CONF_LEN) < 0)
-        VIR_WARN("Failed to restore PCI config space for %s", dev->name);
-
-+    if (pciWrite(dev, 0, config_space, PCI_CONF_LEN) < 0) {
-+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
-+                       _("Failed to restore PCI config space for %s"),
-+                       dev->name);
-+        goto out;
-+    }
-     ret = 0;
- out:
-     pciFreeDevice(conn, parent);
-@@ -516,7 +524,9 @@ pciTryPowerManagementReset(virConnectPtr conn ATTRIBUTE_UNUSED, pciDevice *dev)
- 
-     /* Save and restore the device's config space. */
-     if (pciRead(dev, 0, &config_space[0], PCI_CONF_LEN) < 0) {
-        VIR_WARN("Failed to save PCI config space for %s", dev->name);
-+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
-+                       _("Failed to save PCI config space for %s"),
-+                       dev->name);
-         return -1;
-     }
- 
-@@ -533,8 +543,12 @@ pciTryPowerManagementReset(virConnectPtr conn ATTRIBUTE_UNUSED, pciDevice *dev)
- 
-     usleep(10 * 1000); /* sleep 10ms */
- 
-    if (pciWrite(dev, 0, &config_space[0], PCI_CONF_LEN) < 0)
-        VIR_WARN("Failed to restore PCI config space for %s", dev->name);
-+    if (pciWrite(dev, 0, &config_space[0], PCI_CONF_LEN) < 0) {
-+        pciReportError(conn, VIR_ERR_NO_SUPPORT,
-+                       _("Failed to restore PCI config space for %s"),
-+                       dev->name);
-+        return -1;
-+    }
- 
-     return 0;
- }
-@@ -582,10 +596,14 @@ pciResetDevice(virConnectPtr conn, pciDevice *dev)
-     if (ret < 0 && dev->bus != 0)
-         ret = pciTrySecondaryBusReset(conn, dev);
- 
-    if (ret < 0)
-+    if (ret < 0) {
-+        virErrorPtr err = virGetLastError();
-         pciReportError(conn, VIR_ERR_NO_SUPPORT,
-                       _("No PCI reset capability available for %s"),
-                       dev->name);
-+                       _("Unable to reset PCI device %s: %s"),
-+                       dev->name,
-+                       err ? err->message : _("no FLR, PM reset or bus reset available"));
-+    }
-+
-     return ret;
- }
- 
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 4ce7a54..fd39fc2 100644
--- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -1465,9 +1465,9 @@ qemuDomainReAttachHostDevices(virConnectPtr conn, virDomainDefPtr def)
-             continue;
-         }
- 
-        if (pciDettachDevice(conn, dev) < 0) {
-+        if (pciReAttachDevice(conn, dev) < 0) {
-             virErrorPtr err = virGetLastError();
-            VIR_ERROR(_("Failed to reset PCI device: %s\n"),
-+            VIR_ERROR(_("Failed to re-attach PCI device: %s\n"),
-                       err ? err->message : "");
-             virResetError(err);
-         }
-- 
-1.6.2.5
-
@@ -1,124 +0,0 @@
-From 8f26acc66ca90eea67fd5e84be5a76e3b8aa7fbf Mon Sep 17 00:00:00 2001
-From: Mark McLoughlin <markmc@redhat.com>
-Date: Fri, 14 Aug 2009 08:31:11 +0100
-Subject: [PATCH] Reset and re-attach PCI host devices on guest shutdown
-
-https://bugzilla.redhat.com/499561
-
-When the guest shuts down, we should attempt to restore all PCI host
-devices to a sane state.
-
-In the case of managed hostdevs, we should reset and re-attach the
-devices. In the case of unmanaged hostdevs, we should just reset them.
-
-Note, KVM will already reset assigned devices when the guest shuts
-down using whatever means it can, so we are only doing it to cover the
-cases the kernel can't handle.
-
-* src/qemu_driver.c: add qemuDomainReAttachHostDevices() and call
-  it from qemudShutdownVMDaemon()
-
-(cherry picked from commit 4035152a8767e72fd4e26a91cb4d5afa75b72e61)
-
-Fedora-patch: libvirt-reattach-pci-hostdevs-after-guest-shutdown.patch
---
- src/qemu_driver.c |   76 +++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 76 insertions(+), 0 deletions(-)
-
-diff --git a/src/qemu_driver.c b/src/qemu_driver.c
-index 2c4fd6f..4ce7a54 100644
--- a/src/qemu_driver.c
-+++ b/src/qemu_driver.c
-@@ -1402,6 +1402,80 @@ error:
-     return -1;
- }
- 
-+static void
-+qemuDomainReAttachHostDevices(virConnectPtr conn, virDomainDefPtr def)
-+{
-+    int i;
-+
-+    /* Again 2 loops; reset all the devices before re-attach */
-+
-+    for (i = 0 ; i < def->nhostdevs ; i++) {
-+        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
-+        pciDevice *dev;
-+
-+        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
-+            continue;
-+        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
-+            continue;
-+
-+        dev = pciGetDevice(conn,
-+                           hostdev->source.subsys.u.pci.domain,
-+                           hostdev->source.subsys.u.pci.bus,
-+                           hostdev->source.subsys.u.pci.slot,
-+                           hostdev->source.subsys.u.pci.function);
-+        if (!dev) {
-+            virErrorPtr err = virGetLastError();
-+            VIR_ERROR(_("Failed to allocate pciDevice: %s\n"),
-+                      err ? err->message : "");
-+            virResetError(err);
-+            continue;
-+        }
-+
-+        if (pciResetDevice(conn, dev) < 0) {
-+            virErrorPtr err = virGetLastError();
-+            VIR_ERROR(_("Failed to reset PCI device: %s\n"),
-+                      err ? err->message : "");
-+            virResetError(err);
-+        }
-+
-+        pciFreeDevice(conn, dev);
-+    }
-+
-+    for (i = 0 ; i < def->nhostdevs ; i++) {
-+        virDomainHostdevDefPtr hostdev = def->hostdevs[i];
-+        pciDevice *dev;
-+
-+        if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
-+            continue;
-+        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
-+            continue;
-+        if (!hostdev->managed)
-+            continue;
-+
-+        dev = pciGetDevice(conn,
-+                           hostdev->source.subsys.u.pci.domain,
-+                           hostdev->source.subsys.u.pci.bus,
-+                           hostdev->source.subsys.u.pci.slot,
-+                           hostdev->source.subsys.u.pci.function);
-+        if (!dev) {
-+            virErrorPtr err = virGetLastError();
-+            VIR_ERROR(_("Failed to allocate pciDevice: %s\n"),
-+                      err ? err->message : "");
-+            virResetError(err);
-+            continue;
-+        }
-+
-+        if (pciDettachDevice(conn, dev) < 0) {
-+            virErrorPtr err = virGetLastError();
-+            VIR_ERROR(_("Failed to reset PCI device: %s\n"),
-+                      err ? err->message : "");
-+            virResetError(err);
-+        }
-+
-+        pciFreeDevice(conn, dev);
-+    }
-+}
-+
- static const char *const defaultDeviceACL[] = {
-     "/dev/null", "/dev/full", "/dev/zero",
-     "/dev/random", "/dev/urandom",
-@@ -2109,6 +2183,8 @@ static void qemudShutdownVMDaemon(virConnectPtr conn,
-         VIR_WARN("Failed to restore all device ownership for %s",
-                  vm->def->name);
- 
-+    qemuDomainReAttachHostDevices(conn, vm->def);
-+
- retry:
-     if ((ret = qemuRemoveCgroup(conn, driver, vm)) < 0) {
-         if (ret == -EBUSY && (retries++ < 5)) {
-- 
-1.6.2.5
-
@@ -1 +1 @@
-8c2c14a7695c9c661004bcfc6468d62d  libvirt-0.7.0.tar.gz
+SHA512 (libvirt-3.2.1.tar.xz) = 4ec4faceedcad3a5419e91444b0c83adcbed0ff6482fb53c058a75412064de69e09fd096de4a30b8c1149da6ba03287b10e8af925b01d725e655658035e43d9a