* Wed Aug 19 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.2-16.fc11

- Allow PCI bus reset to reset other devices (#499678) - Fix stupid PCI reset error message (bug #499678) - Allow PM reset on multi-function PCI devices (bug #515689) - Re-attach PCI host devices after guest shuts down (bug #499561) - Fixes list corruption after disk hot-unplug - Fix minor 'virsh nodedev-list --tree' annoyance
Sync patches from git
2009-08-19 16:15:46 +00:00 · 2009-08-17 08:08:56 +00:00 · 2009-08-13 16:07:23 +00:00 · 2009-08-05 15:48:14 +00:00 · 2009-07-03 10:05:41 +00:00 · 2009-06-05 11:47:31 +00:00
53 changed files with 4356 additions and 4094 deletions
@@ -0,0 +1,8 @@
+.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
@@ -1,5 +0,0 @@
-.build*.log
-*.rpm
-i686
-x86_64
-libvirt-*.tar.xz
@@ -1,32 +0,0 @@
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Mon, 21 May 2018 23:05:07 +0100
-Subject: [PATCH] cpu: define the 'ssbd' CPUID feature bit (CVE-2018-3639)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-New microcode introduces the "Speculative Store Bypass Disable"
-CPUID feature bit. This needs to be exposed to guest OS to allow
-them to protect against CVE-2018-3639.
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 1dbca2eccad58d91a5fd33962854f1a653638182)
---
- src/cpu/cpu_map.xml | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index 00a43b172c..245aec3309 100644
--- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -298,6 +298,9 @@
-     <feature name='spec-ctrl'>
-       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x04000000'/>
-     </feature>
-+    <feature name='ssbd'>
-+      <cpuid eax_in='0x07' ecx_in='0x00' edx='0x80000000'/>
-+    </feature>
- 
-     <!-- Processor Extended State Enumeration sub leaf 1 -->
-     <feature name='xsaveopt'>
@@ -1,65 +0,0 @@
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Mon, 5 Mar 2018 12:46:16 +0000
-Subject: [PATCH] tests: force use of "NORMAL" TLS priority in test suite
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When generating certificates we rely on GNUTLS' built-in default setup
-for the ciphers used in the certs. We then currently run with the distro
-specific TLS priority setup which can be much stronger, to the extent
-that the certificates we generate are considered untrustworthy. We don't
-care about the quality of the ciphers we use in the test suite, so just
-force the priority to "NORMAL" which should ensure our certs are
-accepted by GNUTLS.
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
- tests/virnettlscontexttest.c | 4 ++--
- tests/virnettlssessiontest.c | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c
-index 089c10e964..86647f3014 100644
--- a/tests/virnettlscontexttest.c
-+++ b/tests/virnettlscontexttest.c
-@@ -72,7 +72,7 @@ static int testTLSContextInit(const void *opaque)
-                                          data->crt,
-                                          KEYFILE,
-                                          NULL,
-                                         NULL,
-+                                         "NORMAL",
-                                          true,
-                                          true);
-     } else {
-@@ -80,7 +80,7 @@ static int testTLSContextInit(const void *opaque)
-                                          NULL,
-                                          data->crt,
-                                          KEYFILE,
-                                         NULL,
-+                                         "NORMAL",
-                                          true,
-                                          true);
-     }
-diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c
-index 6d639e5b16..7e85607181 100644
--- a/tests/virnettlssessiontest.c
-+++ b/tests/virnettlssessiontest.c
-@@ -113,7 +113,7 @@ static int testTLSSessionInit(const void *opaque)
-                                            data->servercrt,
-                                            KEYFILE,
-                                            data->wildcards,
-                                           NULL,
-+                                           "NORMAL",
-                                            false,
-                                            true);
- 
-@@ -121,7 +121,7 @@ static int testTLSSessionInit(const void *opaque)
-                                            NULL,
-                                            data->clientcrt,
-                                            KEYFILE,
-                                           NULL,
-+                                           "NORMAL",
-                                            false,
-                                            true);
- 
@@ -1,42 +0,0 @@
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Mon, 21 May 2018 23:05:08 +0100
-Subject: [PATCH] cpu: define the 'virt-ssbd' CPUID feature bit (CVE-2018-3639)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some AMD processors only support a non-architectural means of
-enabling Speculative Store Bypass Disable. To allow simplified
-handling in virtual environments, hypervisors will expose an
-architectural definition through CPUID bit 0x80000008_EBX[25].
-This needs to be exposed to guest OS running on AMD x86 hosts to
-allow them to protect against CVE-2018-3639.
-
-Note that since this CPUID bit won't be present in the host CPUID
-results on physical hosts, it will not be enabled automatically
-in guests configured with "host-model" CPU unless using QEMU
-version >= 2.9.0. Thus for older versions of QEMU, this feature
-must be manually enabled using policy=force. Guests using the
-"host-passthrough" CPU mode do not need special handling.
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 9267342206ce17f6933d57a3128cdc504d5945c9)
---
- src/cpu/cpu_map.xml | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index 245aec3309..96daa0f9af 100644
--- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -433,6 +433,9 @@
-     <feature name='ibpb'>
-       <cpuid eax_in='0x80000008' ebx='0x00001000'/>
-     </feature>
-+    <feature name='virt-ssbd'>
-+      <cpuid eax_in='0x80000008' ebx='0x02000000'/>
-+    </feature>
- 
-     <!-- models -->
-     <model name='486'>
@@ -1,31 +0,0 @@
-From: Jim Fehlig <jfehlig@suse.com>
-Date: Wed, 14 Mar 2018 16:42:39 -0600
-Subject: [PATCH] lockd: fix typo in virtlockd-admin.socket
-
-Commit ce7ae55ea1 introduced a typo in virtlockd-admin socket file
-
-/usr/lib/systemd/system/virtlockd-admin.socket:7: Unknown lvalue
-'Server' in section 'Socket'
-
-Change 'Server' to 'Service'.
-
-Signed-off-by: Jim Fehlig <jfehlig@suse.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
- src/locking/virtlockd-admin.socket.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/locking/virtlockd-admin.socket.in b/src/locking/virtlockd-admin.socket.in
-index 1fa0a3dc33..2a7500f3d0 100644
--- a/src/locking/virtlockd-admin.socket.in
-+++ b/src/locking/virtlockd-admin.socket.in
-@@ -4,7 +4,7 @@ Before=libvirtd.service
- 
- [Socket]
- ListenStream=@localstatedir@/run/libvirt/virtlockd-admin-sock
-Server=virtlockd.service
-+Service=virtlockd.service
- 
- [Install]
- WantedBy=sockets.target
@@ -1,105 +0,0 @@
-From: Laine Stump <laine@laine.org>
-Date: Wed, 25 Apr 2018 17:12:03 -0400
-Subject: [PATCH] nwfilter: increase pcap buffer size to be compatible with
- TPACKET_V3
-
-When an nwfilter rule sets the parameter CTRL_IP_LEARNING to "dhcp",
-this turns on the "dhcpsnoop" thread, which uses libpcap to monitor
-traffic on the domain's tap device and extract the IP address from the
-DHCP response.
-
-If libpcap on the host is built with HAVE_TPACKET3 defined (to enable
-support for TPACKET_V3), the dhcpsnoop code's initialization of the
-libpcap socket would fail with the following error:
-
-  virNWFilterSnoopDHCPOpen:1134 : internal error: pcap_setfilter: can't remove kernel filter: Bad file descriptor
-
-It turns out that this was because TPACKET_V3 requires a larger buffer
-size than libvirt was setting (we were setting it to 128k). Changing
-the buffer size to 256k eliminates the error, and the dhcpsnoop thread
-once again works properly.
-
-A fuller explanation of why TPACKET_V3 requires such a large buffer,
-for future git spelunkers:
-
-libpcap calls setsockopt(... SOL_PACKET, PACKET_RX_RING...) to setup a
-ring buffer for receiving packets; two of the attributes sent to this
-API are called tp_frame_size, and tp_frame_nr. If libpcap was built
-with HAVE_TPACKET3 defined, tp_trame_size is set to MAXIMUM_SNAPLEN
-(defined in libpcap sources as 262144) and tp_frame_nr is set to:
-
- [the buffer size we set, i.e. PCAP_BUFFERSIZE i.e. 262144] / tp_frame_size.
-
-So if PCAP_BUFFERSIZE < MAXIMUM_SNAPLEN, then tp_frame_nr (the number
-of frames in the ring buffer) is 0, which is nonsensical. This same
-value is later used as a multiplier to determine the size for a call
-to malloc() (which would also fail).
-
-(NB: if HAVE_TPACKET3 is *not* defined, then tp_frame_size is set to
-the snaplen set by the user (in our case 576) plus a small amount to
-account for ethernet headers, so 256k is far more than adequate)
-
-Since the TPACKET_V3 code in libpcap actually reads multiple packets
-into each frame, it's not a problem to have only a single frame
-(especially when we are monitoring such infrequent traffic), so it's
-okay to set this relatively small buffer size (in comparison to the
-default, which is 2MB), which is important since every guest using
-dhcp snooping in a nwfilter rule will hold 2 of these buffers for the
-entire life of the guest.
-
-Thanks to Christian Ehrhardt for discovering that buffer size was the
-problem (this was not at all obvious from the error that was logged!)
-
-Resolves: https://bugzilla.redhat.com/1547237
-Fixes: https://bugs.launchpad.net/libvirt/+bug/1758037
-
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com> (V1)
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-Tested-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
- src/nwfilter/nwfilter_dhcpsnoop.c | 22 +++++++++++++++++++---
- 1 file changed, 19 insertions(+), 3 deletions(-)
-
-diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
-index 6069e70460..50cfb944a2 100644
--- a/src/nwfilter/nwfilter_dhcpsnoop.c
-+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
-@@ -256,10 +256,21 @@ struct _virNWFilterDHCPDecodeJob {
- # define DHCP_BURST_INTERVAL_S  10 /* sec */
- 
- /*
- * libpcap 1.5 requires a 128kb buffer
- * 128 kb is bigger than (DHCP_PKT_BURST * PCAP_PBUFSIZE / 2)
-+ * NB: Any libpcap built with HAVE_TPACKET3 will require
-+ * PCAP_BUFFERSIZE to be at least 262144 (although
-+ * pcap_set_buffer_size() with a lower value will succeed, and the
-+ * error will only show up later when pcap_setfilter() is called).
-+ *
-+ * It is possible that in the future libpcap could increase the
-+ * minimum size even further, but due to the fact that each guest
-+ * using dhcp snooping keeps 2 pcap sockets open (and thus 2 buffers
-+ * allocated) for the life of the guest, we want to minimize the
-+ * length of the buffer, so instead of leaving it at the default size
-+ * (2MB), we are setting it to the minimum viable size and including
-+ * this clue in the source to help quickly resolve the problem when/if
-+ * it reoccurs.
-  */
-# define PCAP_BUFFERSIZE        (128 * 1024)
-+# define PCAP_BUFFERSIZE        (256 * 1024)
- 
- # define MAX_QUEUED_JOBS        (DHCP_PKT_BURST + 2 * DHCP_PKT_RATE)
- 
-@@ -1114,6 +1125,11 @@ virNWFilterSnoopDHCPOpen(const char *ifname, virMacAddr *mac,
-         goto cleanup_nohandle;
-     }
- 
-+    /* IMPORTANT: If there is any failure of *any* pcap_* function
-+     * during setup of the socket, look to the comment where
-+     * PCAP_BUFFERSIZE is defined. It may be too small, even if the
-+     * generated error doesn't imply that.
-+     */
-     if (pcap_set_snaplen(handle, PCAP_PBUFSIZE) < 0 ||
-         pcap_set_buffer_size(handle, PCAP_BUFFERSIZE) < 0 ||
-         pcap_activate(handle) < 0) {
@@ -1,253 +0,0 @@
-From: Vincent Bernat <vincent@bernat.im>
-Date: Tue, 10 Apr 2018 08:27:15 +0200
-Subject: [PATCH] util: don't check for parallel iteration in hash-related
- functions
-
-This is the responsability of the caller to apply the correct lock
-before using these functions. Moreover, the use of a simple boolean
-was still racy: two threads may check the boolean and "lock" it
-simultaneously.
-
-Users of functions from src/util/virhash.c have to be checked for
-correctness. Lookups and iteration should hold a RO
-lock. Modifications should hold a RW lock.
-
-Most important uses seem to be covered. Callers have now a greater
-responsability, notably the ability to execute some operations while
-iterating were reliably forbidden before are now accepted.
-
-Signed-off-by: Vincent Bernat <vincent@bernat.im>
-(cherry picked from commit 4d7384eb9ddef2008cb0cc165eb808f74bc83d6b)
---
- src/util/virhash.c  | 37 --------------------
- tests/virhashtest.c | 83 ---------------------------------------------
- 2 files changed, 120 deletions(-)
-
-diff --git a/src/util/virhash.c b/src/util/virhash.c
-index 0ffbfcce2c..475c2b0281 100644
--- a/src/util/virhash.c
-+++ b/src/util/virhash.c
-@@ -41,12 +41,6 @@ VIR_LOG_INIT("util.hash");
- 
- /* #define DEBUG_GROW */
- 
-#define virHashIterationError(ret) \
-    do { \
-        VIR_ERROR(_("Hash operation not allowed during iteration")); \
-        return ret; \
-    } while (0)
-
- /*
-  * A single entry in the hash table
-  */
-@@ -66,10 +60,6 @@ struct _virHashTable {
-     uint32_t seed;
-     size_t size;
-     size_t nbElems;
-    /* True iff we are iterating over hash entries. */
-    bool iterating;
-    /* Pointer to the current entry during iteration. */
-    virHashEntryPtr current;
-     virHashDataFree dataFree;
-     virHashKeyCode keyCode;
-     virHashKeyEqual keyEqual;
-@@ -339,9 +329,6 @@ virHashAddOrUpdateEntry(virHashTablePtr table, const void *name,
-     if ((table == NULL) || (name == NULL))
-         return -1;
- 
-    if (table->iterating)
-        virHashIterationError(-1);
-
-     key = virHashComputeKey(table, name);
- 
-     /* Check for duplicate entry */
-@@ -551,9 +538,6 @@ virHashRemoveEntry(virHashTablePtr table, const void *name)
-     nextptr = table->table + virHashComputeKey(table, name);
-     for (entry = *nextptr; entry; entry = entry->next) {
-         if (table->keyEqual(entry->name, name)) {
-            if (table->iterating && table->current != entry)
-                virHashIterationError(-1);
-
-             if (table->dataFree)
-                 table->dataFree(entry->payload, entry->name);
-             if (table->keyFree)
-@@ -593,18 +577,11 @@ virHashForEach(virHashTablePtr table, virHashIterator iter, void *data)
-     if (table == NULL || iter == NULL)
-         return -1;
- 
-    if (table->iterating)
-        virHashIterationError(-1);
-
-    table->iterating = true;
-    table->current = NULL;
-     for (i = 0; i < table->size; i++) {
-         virHashEntryPtr entry = table->table[i];
-         while (entry) {
-             virHashEntryPtr next = entry->next;
-            table->current = entry;
-             ret = iter(entry->payload, entry->name, data);
-            table->current = NULL;
- 
-             if (ret < 0)
-                 goto cleanup;
-@@ -615,7 +592,6 @@ virHashForEach(virHashTablePtr table, virHashIterator iter, void *data)
- 
-     ret = 0;
-  cleanup:
-    table->iterating = false;
-     return ret;
- }
- 
-@@ -643,11 +619,6 @@ virHashRemoveSet(virHashTablePtr table,
-     if (table == NULL || iter == NULL)
-         return -1;
- 
-    if (table->iterating)
-        virHashIterationError(-1);
-
-    table->iterating = true;
-    table->current = NULL;
-     for (i = 0; i < table->size; i++) {
-         virHashEntryPtr *nextptr = table->table + i;
- 
-@@ -667,7 +638,6 @@ virHashRemoveSet(virHashTablePtr table,
-             }
-         }
-     }
-    table->iterating = false;
- 
-     return count;
- }
-@@ -723,23 +693,16 @@ void *virHashSearch(const virHashTable *ctable,
-     if (table == NULL || iter == NULL)
-         return NULL;
- 
-    if (table->iterating)
-        virHashIterationError(NULL);
-
-    table->iterating = true;
-    table->current = NULL;
-     for (i = 0; i < table->size; i++) {
-         virHashEntryPtr entry;
-         for (entry = table->table[i]; entry; entry = entry->next) {
-             if (iter(entry->payload, entry->name, data)) {
-                table->iterating = false;
-                 if (name)
-                     *name = table->keyCopy(entry->name);
-                 return entry->payload;
-             }
-         }
-     }
-    table->iterating = false;
- 
-     return NULL;
- }
-diff --git a/tests/virhashtest.c b/tests/virhashtest.c
-index 3b85b62c30..e9c03c1afb 100644
--- a/tests/virhashtest.c
-+++ b/tests/virhashtest.c
-@@ -221,32 +221,6 @@ testHashRemoveForEachAll(void *payload ATTRIBUTE_UNUSED,
- }
- 
- 
-const int testHashCountRemoveForEachForbidden = ARRAY_CARDINALITY(uuids);
-
-static int
-testHashRemoveForEachForbidden(void *payload ATTRIBUTE_UNUSED,
-                               const void *name,
-                               void *data)
-{
-    virHashTablePtr hash = data;
-    size_t i;
-
-    for (i = 0; i < ARRAY_CARDINALITY(uuids_subset); i++) {
-        if (STREQ(uuids_subset[i], name)) {
-            int next = (i + 1) % ARRAY_CARDINALITY(uuids_subset);
-
-            if (virHashRemoveEntry(hash, uuids_subset[next]) == 0) {
-                VIR_TEST_VERBOSE(
-                        "\nentry \"%s\" should not be allowed to be removed",
-                        uuids_subset[next]);
-            }
-            break;
-        }
-    }
-    return 0;
-}
-
-
- static int
- testHashRemoveForEach(const void *data)
- {
-@@ -303,61 +277,6 @@ testHashSteal(const void *data ATTRIBUTE_UNUSED)
- }
- 
- 
-static int
-testHashIter(void *payload ATTRIBUTE_UNUSED,
-             const void *name ATTRIBUTE_UNUSED,
-             void *data ATTRIBUTE_UNUSED)
-{
-    return 0;
-}
-
-static int
-testHashForEachIter(void *payload ATTRIBUTE_UNUSED,
-                    const void *name ATTRIBUTE_UNUSED,
-                    void *data)
-{
-    virHashTablePtr hash = data;
-
-    if (virHashAddEntry(hash, uuids_new[0], NULL) == 0)
-        VIR_TEST_VERBOSE("\nadding entries in ForEach should be forbidden");
-
-    if (virHashUpdateEntry(hash, uuids_new[0], NULL) == 0)
-        VIR_TEST_VERBOSE("\nupdating entries in ForEach should be forbidden");
-
-    if (virHashSteal(hash, uuids_new[0]) != NULL)
-        VIR_TEST_VERBOSE("\nstealing entries in ForEach should be forbidden");
-
-    if (virHashSteal(hash, uuids_new[0]) != NULL)
-        VIR_TEST_VERBOSE("\nstealing entries in ForEach should be forbidden");
-
-    if (virHashForEach(hash, testHashIter, NULL) >= 0)
-        VIR_TEST_VERBOSE("\niterating through hash in ForEach"
-                " should be forbidden");
-    return 0;
-}
-
-static int
-testHashForEach(const void *data ATTRIBUTE_UNUSED)
-{
-    virHashTablePtr hash;
-    int ret = -1;
-
-    if (!(hash = testHashInit(0)))
-        return -1;
-
-    if (virHashForEach(hash, testHashForEachIter, hash)) {
-        VIR_TEST_VERBOSE("\nvirHashForEach didn't go through all entries");
-        goto cleanup;
-    }
-
-    ret = 0;
-
- cleanup:
-    virHashFree(hash);
-    return ret;
-}
-
-
- static int
- testHashRemoveSetIter(const void *payload ATTRIBUTE_UNUSED,
-                       const void *name,
-@@ -628,9 +547,7 @@ mymain(void)
-     DO_TEST("Remove", Remove);
-     DO_TEST_DATA("Remove in ForEach", RemoveForEach, Some);
-     DO_TEST_DATA("Remove in ForEach", RemoveForEach, All);
-    DO_TEST_DATA("Remove in ForEach", RemoveForEach, Forbidden);
-     DO_TEST("Steal", Steal);
-    DO_TEST("Forbidden ops in ForEach", ForEach);
-     DO_TEST("RemoveSet", RemoveSet);
-     DO_TEST("Search", Search);
-     DO_TEST("GetItems", GetItems);
@@ -1,64 +0,0 @@
-From: Matthias Bolte <matthias.bolte@googlemail.com>
-Date: Thu, 2 Aug 2018 17:33:37 +0200
-Subject: [PATCH] esx: Fix double-free and freeing static strings in
- esxDomainSetAutostart
-
-Since commit ae83e02f3dd7fe99fed5d8159a35b666fafeafd5#l3393 the
-newPowerInfo pointer itself is used to track the ownership of the
-AutoStartPowerInfo object to make Coverity understand the code better.
-This broke the code that unset some members of the AutoStartPowerInfo
-object that should not be freed the normal way.
-
-Instead, transfer ownership of the AutoStartPowerInfo object to the
-HostAutoStartManagerConfig object before filling in the values that
-need special handling. This allows to free the AutoStartPowerInfo
-directly without having to deal with the special values, or to let
-the old (now restored) logic handle the special values again.
-
-Signed-off-by: Matthias Bolte <matthias.bolte@googlemail.com>
-Tested-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit 3ad77f853230f870efa396636e008292c7f2b1c0)
---
- src/esx/esx_driver.c | 14 ++++----------
- 1 file changed, 4 insertions(+), 10 deletions(-)
-
-diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
-index b065cdc513..9a7006c6e5 100644
--- a/src/esx/esx_driver.c
-+++ b/src/esx/esx_driver.c
-@@ -3422,7 +3422,10 @@ esxDomainSetAutostart(virDomainPtr domain, int autostart)
-     if (esxVI_AutoStartPowerInfo_Alloc(&newPowerInfo) < 0 ||
-         esxVI_Int_Alloc(&newPowerInfo->startOrder) < 0 ||
-         esxVI_Int_Alloc(&newPowerInfo->startDelay) < 0 ||
-        esxVI_Int_Alloc(&newPowerInfo->stopDelay) < 0) {
-+        esxVI_Int_Alloc(&newPowerInfo->stopDelay) < 0 ||
-+        esxVI_AutoStartPowerInfo_AppendToList(&spec->powerInfo,
-+                                              newPowerInfo) < 0) {
-+        esxVI_AutoStartPowerInfo_Free(&newPowerInfo);
-         goto cleanup;
-     }
- 
-@@ -3434,13 +3437,6 @@ esxDomainSetAutostart(virDomainPtr domain, int autostart)
-     newPowerInfo->stopDelay->value = -1; /* use system default */
-     newPowerInfo->stopAction = (char *)"none";
- 
-    if (esxVI_AutoStartPowerInfo_AppendToList(&spec->powerInfo,
-                                              newPowerInfo) < 0) {
-        goto cleanup;
-    }
-
-    newPowerInfo = NULL;
-
-     if (esxVI_ReconfigureAutostart
-           (priv->primary,
-            priv->primary->hostSystem->configManager->autoStartManager,
-@@ -3462,8 +3458,6 @@ esxDomainSetAutostart(virDomainPtr domain, int autostart)
-     esxVI_AutoStartDefaults_Free(&defaults);
-     esxVI_AutoStartPowerInfo_Free(&powerInfoList);
- 
-    esxVI_AutoStartPowerInfo_Free(&newPowerInfo);
-
-     return result;
- }
- 
@@ -1,55 +0,0 @@
-From 8d6ab7976fa691763fc05a154f2bab865d435b00 Mon Sep 17 00:00:00 2001
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 5 Apr 2019 11:33:32 +0200
-Subject: [PATCH 1/4] cpu_x86: Do not cache microcode version
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The microcode version checks are used to invalidate cached CPU data we
-get from QEMU. To minimize /proc/cpuinfo parsing the microcode version
-was only read when libvirtd started and cached for the daemon's
-lifetime. However, the CPU microcode can change anytime (updating the
-microcode package can automatically upload it to the CPU) and we need to
-stop caching it to avoid using stale CPU model data.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit be46f613261d3b655a1f15afd635087e68a9c39b)
---
- src/cpu/cpu_x86.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index b2398c5ad2..38cab15c59 100644
--- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -154,7 +154,6 @@ struct _virCPUx86Map {
- };
- 
- static virCPUx86MapPtr cpuMap;
-static unsigned int microcodeVersion;
- 
- int virCPUx86DriverOnceInit(void);
- VIR_ONCE_GLOBAL_INIT(virCPUx86Driver);
-@@ -1413,8 +1412,6 @@ virCPUx86DriverOnceInit(void)
-     if (!(cpuMap = virCPUx86LoadMap()))
-         return -1;
- 
-    microcodeVersion = virHostCPUGetMicrocodeVersion();
-
-     return 0;
- }
- 
-@@ -2454,7 +2451,7 @@ virCPUx86GetHost(virCPUDefPtr cpu,
-         goto cleanup;
- 
-     ret = x86DecodeCPUData(cpu, cpuData, models);
-    cpu->microcodeVersion = microcodeVersion;
-+    cpu->microcodeVersion = virHostCPUGetMicrocodeVersion();
- 
-  cleanup:
-     virCPUx86DataFree(cpuData);
-- 
-2.21.0
-
@@ -1,155 +0,0 @@
-From cb6bcb0312a33a0b6a48d0ee1f368c9080e4a13d Mon Sep 17 00:00:00 2001
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 12 Apr 2019 21:21:05 +0200
-Subject: [PATCH 2/4] qemu: Don't cache microcode version
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-My earlier commit be46f61326 was incomplete. It removed caching of
-microcode version in the CPU driver, which means the capabilities XML
-will see the correct microcode version. But it is also cached in the
-QEMU capabilities cache where it is used to detect whether we need to
-reprobe QEMU. By missing the second place, the original commit
-be46f61326 made the situation even worse since libvirt would report
-correct microcode version while still using the old host CPU model
-(visible in domain capabilities XML).
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 673c62a3b7855a0685d8f116e227c402720b9ee9)
-
-CVE-2018-12126, CVE-2018-12127, CVE-2018-12130
-
-Conflicts:
-	src/qemu/qemu_capabilities.c
-            - virQEMUCapsCacheLookupByArch refactoring (commits
-              7948ad4129a and 1a3de67001c) are missing
-            - commit a7424faff0f "Force QMP capability probing" is
-              missing downstream
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
- src/qemu/qemu_capabilities.c | 12 ++++++++----
- src/qemu/qemu_capabilities.h |  3 +--
- src/qemu/qemu_driver.c       |  9 +--------
- tests/testutilsqemu.c        |  2 +-
- 4 files changed, 11 insertions(+), 15 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index b5eb8cf46a..17eb6579bf 100644
--- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -5343,7 +5343,7 @@ virQEMUCapsNewData(const char *binary,
-                                            priv->libDir,
-                                            priv->runUid,
-                                            priv->runGid,
-                                           priv->microcodeVersion,
-+                                           virHostCPUGetMicrocodeVersion(),
-                                            priv->kernelVersion,
-                                            false);
- }
-@@ -5427,8 +5427,7 @@ virFileCachePtr
- virQEMUCapsCacheNew(const char *libDir,
-                     const char *cacheDir,
-                     uid_t runUid,
-                    gid_t runGid,
-                    unsigned int microcodeVersion)
-+                    gid_t runGid)
- {
-     char *capsCacheDir = NULL;
-     virFileCachePtr cache = NULL;
-@@ -5452,7 +5451,6 @@ virQEMUCapsCacheNew(const char *libDir,
- 
-     priv->runUid = runUid;
-     priv->runGid = runGid;
-    priv->microcodeVersion = microcodeVersion;
- 
-     if (uname(&uts) == 0 &&
-         virAsprintf(&priv->kernelVersion, "%s %s", uts.release, uts.version) < 0)
-@@ -5473,8 +5471,11 @@ virQEMUCapsPtr
- virQEMUCapsCacheLookup(virFileCachePtr cache,
-                        const char *binary)
- {
-+    virQEMUCapsCachePrivPtr priv = virFileCacheGetPriv(cache);
-     virQEMUCapsPtr ret = NULL;
- 
-+    priv->microcodeVersion = virHostCPUGetMicrocodeVersion();
-+
-     ret = virFileCacheLookup(cache, binary);
- 
-     VIR_DEBUG("Returning caps %p for %s", ret, binary);
-@@ -5520,10 +5521,13 @@ virQEMUCapsPtr
- virQEMUCapsCacheLookupByArch(virFileCachePtr cache,
-                              virArch arch)
- {
-+    virQEMUCapsCachePrivPtr priv = virFileCacheGetPriv(cache);
-     virQEMUCapsPtr ret = NULL;
-     virArch target;
-     struct virQEMUCapsSearchData data = { .arch = arch };
- 
-+    priv->microcodeVersion = virHostCPUGetMicrocodeVersion();
-+
-     ret = virFileCacheLookupByFunc(cache, virQEMUCapsCompareArch, &data);
-     if (!ret) {
-         /* If the first attempt at finding capabilities has failed, try
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index c2ec2be193..7fd51f5fa0 100644
--- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -524,8 +524,7 @@ void virQEMUCapsFilterByMachineType(virQEMUCapsPtr qemuCaps,
- virFileCachePtr virQEMUCapsCacheNew(const char *libDir,
-                                     const char *cacheDir,
-                                     uid_t uid,
-                                    gid_t gid,
-                                    unsigned int microcodeVersion);
-+                                    gid_t gid);
- virQEMUCapsPtr virQEMUCapsCacheLookup(virFileCachePtr cache,
-                                       const char *binary);
- virQEMUCapsPtr virQEMUCapsCacheLookupCopy(virFileCachePtr cache,
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 96454c17c0..bb38904090 100644
--- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -610,8 +610,6 @@ qemuStateInitialize(bool privileged,
-     char *hugepagePath = NULL;
-     char *memoryBackingPath = NULL;
-     size_t i;
-    virCPUDefPtr hostCPU = NULL;
-    unsigned int microcodeVersion = 0;
- 
-     if (VIR_ALLOC(qemu_driver) < 0)
-         return -1;
-@@ -831,15 +829,10 @@ qemuStateInitialize(bool privileged,
-         run_gid = cfg->group;
-     }
- 
-    if ((hostCPU = virCPUProbeHost(virArchFromHost())))
-        microcodeVersion = hostCPU->microcodeVersion;
-    virCPUDefFree(hostCPU);
-
-     qemu_driver->qemuCapsCache = virQEMUCapsCacheNew(cfg->libDir,
-                                                      cfg->cacheDir,
-                                                      run_uid,
-                                                     run_gid,
-                                                     microcodeVersion);
-+                                                     run_gid);
-     if (!qemu_driver->qemuCapsCache)
-         goto error;
- 
-diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
-index f8182033fc..2c7124bf26 100644
--- a/tests/testutilsqemu.c
-+++ b/tests/testutilsqemu.c
-@@ -603,7 +603,7 @@ int qemuTestDriverInit(virQEMUDriver *driver)
- 
-     /* Using /dev/null for libDir and cacheDir automatically produces errors
-      * upon attempt to use any of them */
-    driver->qemuCapsCache = virQEMUCapsCacheNew("/dev/null", "/dev/null", 0, 0, 0);
-+    driver->qemuCapsCache = virQEMUCapsCacheNew("/dev/null", "/dev/null", 0, 0);
-     if (!driver->qemuCapsCache)
-         goto error;
- 
-- 
-2.21.0
-
@@ -1,886 +0,0 @@
-From 36151b10d3e1f8f92f4ad6b8200ce5355b7f96f0 Mon Sep 17 00:00:00 2001
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 5 Apr 2019 11:19:30 +0200
-Subject: [PATCH 3/4] cputest: Add data for Intel(R) Xeon(R) CPU E3-1225 v5
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 5cd9db3ac11e88846cbcf95fad9f6fae9d880dee)
-
-CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091
-
-Conflicts:
-	tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-	tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-            - intel-pt feature is missing
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
- tests/cputest.c                               |   1 +
- .../x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml |   7 +
- .../x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml  |   8 +
- .../x86_64-cpuid-Xeon-E3-1225-v5-guest.xml    |  27 +
- .../x86_64-cpuid-Xeon-E3-1225-v5-host.xml     |  28 +
- .../x86_64-cpuid-Xeon-E3-1225-v5-json.xml     |  11 +
- .../x86_64-cpuid-Xeon-E3-1225-v5.json         | 652 ++++++++++++++++++
- .../x86_64-cpuid-Xeon-E3-1225-v5.sig          |   4 +
- .../x86_64-cpuid-Xeon-E3-1225-v5.xml          |  47 ++
- 9 files changed, 785 insertions(+)
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.json
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.xml
-
-diff --git a/tests/cputest.c b/tests/cputest.c
-index 1e79edbef7..2df1d28e39 100644
--- a/tests/cputest.c
-+++ b/tests/cputest.c
-@@ -1189,6 +1189,7 @@ mymain(void)
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Phenom-B95", JSON_HOST);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Ryzen-7-1800X-Eight-Core", JSON_HOST);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-5110", JSON_NONE);
-+    DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E3-1225-v5", JSON_MODELS);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E3-1245-v5", JSON_MODELS);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2609-v3", JSON_MODELS);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2623-v4", JSON_MODELS);
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml
-new file mode 100644
-index 0000000000..ce51903e53
--- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml
-@@ -0,0 +1,7 @@
-+<!-- Features disabled by QEMU -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1fc' edx='0xb0600000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-+</cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
-new file mode 100644
-index 0000000000..0deca9fba6
--- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
-@@ -0,0 +1,8 @@
-+<!-- Features enabled by QEMU -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3203' edx='0x0f8bfbff'/>
-+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c4fbb' ecx='0x00000000' edx='0x8c000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000007' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
-+</cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-new file mode 100644
-index 0000000000..141c01c841
--- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-@@ -0,0 +1,27 @@
-+<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>Skylake-Client-IBRS</model>
-+  <vendor>Intel</vendor>
-+  <feature policy='require' name='ds'/>
-+  <feature policy='require' name='acpi'/>
-+  <feature policy='require' name='ss'/>
-+  <feature policy='require' name='ht'/>
-+  <feature policy='require' name='tm'/>
-+  <feature policy='require' name='pbe'/>
-+  <feature policy='require' name='dtes64'/>
-+  <feature policy='require' name='monitor'/>
-+  <feature policy='require' name='ds_cpl'/>
-+  <feature policy='require' name='vmx'/>
-+  <feature policy='require' name='smx'/>
-+  <feature policy='require' name='est'/>
-+  <feature policy='require' name='tm2'/>
-+  <feature policy='require' name='xtpr'/>
-+  <feature policy='require' name='pdcm'/>
-+  <feature policy='require' name='osxsave'/>
-+  <feature policy='require' name='tsc_adjust'/>
-+  <feature policy='require' name='clflushopt'/>
-+  <feature policy='require' name='stibp'/>
-+  <feature policy='require' name='ssbd'/>
-+  <feature policy='require' name='xsaves'/>
-+  <feature policy='require' name='pdpe1gb'/>
-+  <feature policy='require' name='invtsc'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-new file mode 100644
-index 0000000000..53bfc9728d
--- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-@@ -0,0 +1,28 @@
-+<cpu>
-+  <arch>x86_64</arch>
-+  <model>Skylake-Client-IBRS</model>
-+  <vendor>Intel</vendor>
-+  <feature name='ds'/>
-+  <feature name='acpi'/>
-+  <feature name='ss'/>
-+  <feature name='ht'/>
-+  <feature name='tm'/>
-+  <feature name='pbe'/>
-+  <feature name='dtes64'/>
-+  <feature name='monitor'/>
-+  <feature name='ds_cpl'/>
-+  <feature name='vmx'/>
-+  <feature name='smx'/>
-+  <feature name='est'/>
-+  <feature name='tm2'/>
-+  <feature name='xtpr'/>
-+  <feature name='pdcm'/>
-+  <feature name='osxsave'/>
-+  <feature name='tsc_adjust'/>
-+  <feature name='clflushopt'/>
-+  <feature name='stibp'/>
-+  <feature name='ssbd'/>
-+  <feature name='xsaves'/>
-+  <feature name='pdpe1gb'/>
-+  <feature name='invtsc'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
-new file mode 100644
-index 0000000000..1f321db273
--- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
-@@ -0,0 +1,11 @@
-+<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>Skylake-Client-IBRS</model>
-+  <vendor>Intel</vendor>
-+  <feature policy='require' name='ss'/>
-+  <feature policy='require' name='hypervisor'/>
-+  <feature policy='require' name='tsc_adjust'/>
-+  <feature policy='require' name='clflushopt'/>
-+  <feature policy='require' name='stibp'/>
-+  <feature policy='require' name='ssbd'/>
-+  <feature policy='require' name='pdpe1gb'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.json b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.json
-new file mode 100644
-index 0000000000..084747556b
--- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.json
-@@ -0,0 +1,652 @@
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "phys-bits": 0,
-+        "core-id": -1,
-+        "xlevel": 2147483656,
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "pause-filter": false,
-+        "xsavec": true,
-+        "intel-pt": false,
-+        "osxsave": false,
-+        "hv-frequencies": false,
-+        "tsc-frequency": 0,
-+        "xd": true,
-+        "hv-vendor-id": "",
-+        "kvm-asyncpf": true,
-+        "kvm_asyncpf": true,
-+        "perfctr_core": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "decodeassists": false,
-+        "avx512cd": false,
-+        "sse4_1": true,
-+        "sse4.1": true,
-+        "sse4-1": true,
-+        "family": 6,
-+        "legacy-cache": true,
-+        "vmware-cpuid-freq": true,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "hv-runtime": false,
-+        "xcrypt": false,
-+        "thread-id": -1,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "hv-relaxed": false,
-+        "hv-crash": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "avx512vbmi2": false,
-+        "cr8legacy": false,
-+        "stibp": true,
-+        "cpuid-0xb": true,
-+        "xcrypt-en": false,
-+        "kvm_pv_eoi": true,
-+        "apic-id": 4294967295,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "pku": false,
-+        "smx": false,
-+        "cmp_legacy": false,
-+        "cmp-legacy": false,
-+        "node-id": -1,
-+        "avx512-4fmaps": false,
-+        "vmcb_clean": false,
-+        "vmcb-clean": false,
-+        "3dnowext": false,
-+        "hle": true,
-+        "npt": false,
-+        "memory": "/machine/unattached/system[0]",
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm_lock": false,
-+        "svm-lock": false,
-+        "pfthreshold": false,
-+        "smep": true,
-+        "smap": true,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "hv-stimer": false,
-+        "i64": true,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "ace2-en": false,
-+        "pat": true,
-+        "pae": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm_nopiodelay": true,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "socket-id": -1,
-+        "pcommit": false,
-+        "syscall": true,
-+        "level": 13,
-+        "avx512dq": false,
-+        "svm": false,
-+        "full-cpuid-auto-level": true,
-+        "hv-reset": false,
-+        "invtsc": false,
-+        "sse3": true,
-+        "sse2": true,
-+        "ssbd": true,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": true,
-+        "cx8": true,
-+        "kvm_mmu": false,
-+        "kvm-mmu": false,
-+        "sse4_2": true,
-+        "sse4.2": true,
-+        "sse4-2": true,
-+        "pge": true,
-+        "fill-mtrr-mask": true,
-+        "avx512bitalg": false,
-+        "nodeid_msr": false,
-+        "pdcm": false,
-+        "movbe": true,
-+        "model": 94,
-+        "nrip_save": false,
-+        "nrip-save": false,
-+        "kvm_pv_unhalt": true,
-+        "ssse3": true,
-+        "sse4a": false,
-+        "invpcid": true,
-+        "pdpe1gb": true,
-+        "tsc-deadline": true,
-+        "fma": true,
-+        "cx16": true,
-+        "de": true,
-+        "enforce": false,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ibs": false,
-+        "ds_cpl": false,
-+        "ds-cpl": false,
-+        "host-phys-bits": true,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "check": true,
-+        "hv-spinlocks": -1,
-+        "pmu": false,
-+        "pmm": false,
-+        "apic": true,
-+        "spec-ctrl": true,
-+        "min-xlevel2": 0,
-+        "tsc-adjust": true,
-+        "tsc_adjust": true,
-+        "kvm-steal-time": true,
-+        "kvm_steal_time": true,
-+        "kvmclock": true,
-+        "l3-cache": true,
-+        "lwp": false,
-+        "ibpb": false,
-+        "xop": false,
-+        "avx": true,
-+        "ospke": false,
-+        "ace2": false,
-+        "avx512bw": false,
-+        "acpi": false,
-+        "hv-vapic": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": false,
-+        "vaes": false,
-+        "popcnt": true,
-+        "xsaves": false,
-+        "tcg-cpuid": true,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": true,
-+        "sep": true,
-+        "pclmuldq": true,
-+        "virt-ssbd": false,
-+        "x-hv-max-vps": -1,
-+        "nodeid-msr": false,
-+        "md-clear": true,
-+        "kvm": true,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "kvm-pv-unhalt": true,
-+        "bmi2": true,
-+        "bmi1": true,
-+        "realized": false,
-+        "tsc_scale": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "hv-vpindex": false,
-+        "xlevel2": 0,
-+        "clflushopt": true,
-+        "kvm-no-smi-migration": false,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": true,
-+        "3dnow": false,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "lahf_lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "hv-synic": false,
-+        "xstore": false,
-+        "fxsr_opt": false,
-+        "kvm-hint-dedicated": false,
-+        "rtm": true,
-+        "lmce": true,
-+        "hv-time": false,
-+        "perfctr-nb": false,
-+        "perfctr_nb": false,
-+        "ffxsr": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "avx512-4vnniw": false,
-+        "vmx": false,
-+        "vme": true,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "pause_filter": false,
-+        "sha-ni": false,
-+        "model-id": "Intel(R) Xeon(R) CPU E3-1225 v5 @ 3.30GHz",
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "model-expansion"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "max",
-+      "typename": "max-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": false
-+    },
-+    {
-+      "name": "host",
-+      "typename": "host-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": false
-+    },
-+    {
-+      "name": "base",
-+      "typename": "base-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu64",
-+      "typename": "qemu64-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu32",
-+      "typename": "qemu32-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "phenom",
-+      "typename": "phenom-x86_64-cpu",
-+      "unavailable-features": [
-+        "mmxext",
-+        "fxsr-opt",
-+        "3dnowext",
-+        "3dnow",
-+        "sse4a",
-+        "npt"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium3",
-+      "typename": "pentium3-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium2",
-+      "typename": "pentium2-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium",
-+      "typename": "pentium-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "n270",
-+      "typename": "n270-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm64",
-+      "typename": "kvm64-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm32",
-+      "typename": "kvm32-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "cpu64-rhel6",
-+      "typename": "cpu64-rhel6-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "coreduo",
-+      "typename": "coreduo-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "core2duo",
-+      "typename": "core2duo-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "athlon",
-+      "typename": "athlon-x86_64-cpu",
-+      "unavailable-features": [
-+        "mmxext",
-+        "3dnowext",
-+        "3dnow"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Westmere",
-+      "typename": "Westmere-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Westmere-IBRS",
-+      "typename": "Westmere-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Server",
-+      "typename": "Skylake-Server-x86_64-cpu",
-+      "unavailable-features": [
-+        "avx512f",
-+        "avx512dq",
-+        "clwb",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512f",
-+        "avx512f",
-+        "avx512f"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Server-IBRS",
-+      "typename": "Skylake-Server-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "avx512f",
-+        "avx512dq",
-+        "clwb",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512f",
-+        "avx512f",
-+        "avx512f"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Client",
-+      "typename": "Skylake-Client-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Client-IBRS",
-+      "typename": "Skylake-Client-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "SandyBridge",
-+      "typename": "SandyBridge-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "SandyBridge-IBRS",
-+      "typename": "SandyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Penryn",
-+      "typename": "Penryn-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G5",
-+      "typename": "Opteron_G5-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse",
-+        "xop",
-+        "fma4",
-+        "tbm"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G4",
-+      "typename": "Opteron_G4-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse",
-+        "xop",
-+        "fma4"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G3",
-+      "typename": "Opteron_G3-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G2",
-+      "typename": "Opteron_G2-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G1",
-+      "typename": "Opteron_G1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Nehalem",
-+      "typename": "Nehalem-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Nehalem-IBRS",
-+      "typename": "Nehalem-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "IvyBridge",
-+      "typename": "IvyBridge-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "IvyBridge-IBRS",
-+      "typename": "IvyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell",
-+      "typename": "Haswell-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-noTSX",
-+      "typename": "Haswell-noTSX-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-noTSX-IBRS",
-+      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-IBRS",
-+      "typename": "Haswell-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "EPYC",
-+      "typename": "EPYC-x86_64-cpu",
-+      "unavailable-features": [
-+        "sha-ni",
-+        "mmxext",
-+        "fxsr-opt",
-+        "cr8legacy",
-+        "sse4a",
-+        "misalignsse",
-+        "osvw"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "EPYC-IBPB",
-+      "typename": "EPYC-IBPB-x86_64-cpu",
-+      "unavailable-features": [
-+        "sha-ni",
-+        "mmxext",
-+        "fxsr-opt",
-+        "cr8legacy",
-+        "sse4a",
-+        "misalignsse",
-+        "osvw",
-+        "ibpb"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Conroe",
-+      "typename": "Conroe-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell",
-+      "typename": "Broadwell-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-noTSX",
-+      "typename": "Broadwell-noTSX-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-noTSX-IBRS",
-+      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-IBRS",
-+      "typename": "Broadwell-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "486",
-+      "typename": "486-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    }
-+  ],
-+  "id": "definitions"
-+}
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.sig b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.sig
-new file mode 100644
-index 0000000000..7e57c2ded6
--- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.sig
-@@ -0,0 +1,4 @@
-+0506e3
-+family:     6 (0x06)
-+model:     94 (0x5e)
-+stepping:   3 (0x03)
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.xml
-new file mode 100644
-index 0000000000..437429d61d
--- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.xml
-@@ -0,0 +1,47 @@
-+<!-- Intel(R) Xeon(R) CPU E3-1225 v5 @ 3.30GHz -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000016' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000506e3' ebx='0x06100800' ecx='0x7ffafbff' edx='0xbfebfbff'/>
-+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b6ff' ecx='0x00000000' edx='0x00c30000'/>
-+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x00c0003f' ecx='0x000003ff' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00001fff' edx='0x00000006'/>
-+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00142120'/>
-+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x000027f7' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x029c6fbf' ecx='0x00000000' edx='0x9c002400'/>
-+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300804' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
-+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000001' ecx='0x00000100' edx='0x00000006'/>
-+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000004' ecx='0x00000201' edx='0x00000006'/>
-+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x0000001f' ebx='0x00000440' ecx='0x00000440' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x000003c0' ecx='0x00000100' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x03' eax='0x00000040' ebx='0x000003c0' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x04' eax='0x00000040' ebx='0x00000400' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x08' eax='0x00000080' ebx='0x00000000' ecx='0x00000001' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000001' ebx='0x0000000f' ecx='0x00000007' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000014' ecx_in='0x01' eax='0x02490002' ebx='0x003f3fff' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000015' ecx_in='0x00' eax='0x00000002' ebx='0x00000114' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000016' ecx_in='0x00' eax='0x00000ce4' ebx='0x00000e74' ecx='0x00000064' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
-+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6f655820' edx='0x2952286e'/>
-+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x55504320' ebx='0x2d334520' ecx='0x35323231' edx='0x20357620'/>
-+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x2e332040' ebx='0x48473033' ecx='0x0000007a' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003027' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000ce4' ebx='0x00000e74' ecx='0x00000064' edx='0x00000000'/>
-+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000ce4' ebx='0x00000e74' ecx='0x00000064' edx='0x00000000'/>
-+</cpudata>
-- 
-2.21.0
-
@@ -1,105 +0,0 @@
-From 7bde733e906a9eb513448fd58201a333a1793811 Mon Sep 17 00:00:00 2001
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 5 Apr 2019 15:11:20 +0200
-Subject: [PATCH 4/4] cpu_map: Define md-clear CPUID bit
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-CVE-2018-12126, CVE-2018-12127, CVE-2018-12130
-
-The bit is set when microcode provides the mechanism to invoke a flush
-of various exploitable CPU buffers by invoking the VERW instruction.
-
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 538d873571d7a682852dc1d70e5f4478f4d64e85)
-
-Conflicts:
-	src/cpu_map/x86_features.xml
-            - no CPU map split downstream
-
-	tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
-	tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
-            - test data missing downstream
-
-	tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-	tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-            - intel-pt feature is missing downstream
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
- src/cpu/cpu_map.xml                                        | 3 +++
- tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml | 2 +-
- tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml   | 1 +
- tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml    | 1 +
- tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml    | 1 +
- 5 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index 96daa0f9af..250e241df9 100644
--- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -295,6 +295,9 @@
-     <feature name='avx512-4fmaps'>
-       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000008'/>
-     </feature>
-+    <feature name='md-clear'> <!-- md_clear -->
-+      <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000400'/>
-+    </feature>
-     <feature name='spec-ctrl'>
-       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x04000000'/>
-     </feature>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
-index 0deca9fba6..74763a462b 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
-@@ -2,7 +2,7 @@
- <cpudata arch='x86'>
-   <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3203' edx='0x0f8bfbff'/>
-   <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c4fbb' ecx='0x00000000' edx='0x8c000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c4fbb' ecx='0x00000000' edx='0x8c000400'/>
-   <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000007' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-   <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
- </cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-index 141c01c841..3b3472742e 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-@@ -19,6 +19,7 @@
-   <feature policy='require' name='osxsave'/>
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='clflushopt'/>
-+  <feature policy='require' name='md-clear'/>
-   <feature policy='require' name='stibp'/>
-   <feature policy='require' name='ssbd'/>
-   <feature policy='require' name='xsaves'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-index 53bfc9728d..df4f97417c 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-@@ -20,6 +20,7 @@
-   <feature name='osxsave'/>
-   <feature name='tsc_adjust'/>
-   <feature name='clflushopt'/>
-+  <feature name='md-clear'/>
-   <feature name='stibp'/>
-   <feature name='ssbd'/>
-   <feature name='xsaves'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
-index 1f321db273..a5591278df 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
-@@ -5,6 +5,7 @@
-   <feature policy='require' name='hypervisor'/>
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='clflushopt'/>
-+  <feature policy='require' name='md-clear'/>
-   <feature policy='require' name='stibp'/>
-   <feature policy='require' name='ssbd'/>
-   <feature policy='require' name='pdpe1gb'/>
-- 
-2.21.0
-
@@ -1,56 +0,0 @@
-From 4cb90fa2335b75a0fc39440853bd681955b326a4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Tue, 14 May 2019 21:09:59 +0100
-Subject: [PATCH] cputest: remove stibp flag from test data
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-stibp flag doesn't exist in this maint branch.
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
- tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml | 1 -
- tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml  | 1 -
- tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml  | 1 -
- 3 files changed, 3 deletions(-)
-
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-index 3b3472742e..29c1fdb80a 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-@@ -20,7 +20,6 @@
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='clflushopt'/>
-   <feature policy='require' name='md-clear'/>
-  <feature policy='require' name='stibp'/>
-   <feature policy='require' name='ssbd'/>
-   <feature policy='require' name='xsaves'/>
-   <feature policy='require' name='pdpe1gb'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-index df4f97417c..2003ca9ef6 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-@@ -21,7 +21,6 @@
-   <feature name='tsc_adjust'/>
-   <feature name='clflushopt'/>
-   <feature name='md-clear'/>
-  <feature name='stibp'/>
-   <feature name='ssbd'/>
-   <feature name='xsaves'/>
-   <feature name='pdpe1gb'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
-index a5591278df..d6529c59a3 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
-@@ -6,7 +6,6 @@
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='clflushopt'/>
-   <feature policy='require' name='md-clear'/>
-  <feature policy='require' name='stibp'/>
-   <feature policy='require' name='ssbd'/>
-   <feature policy='require' name='pdpe1gb'/>
- </cpu>
-- 
-2.21.0
-
@@ -1,58 +0,0 @@
-From 39fb5ab3125d1669344bab94ccb71bce814d9ae2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Tue, 30 Apr 2019 17:26:13 +0100
-Subject: [PATCH 1/3] admin: reject clients unless their UID matches the
- current UID
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The admin protocol RPC messages are only intended for use by the user
-running the daemon. As such they should not be allowed for any client
-UID that does not match the server UID.
-
-Fixes CVE-2019-10132
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 96f41cd765c9e525fe28ee5abbfbf4a79b3720c7)
---
- src/admin/admin_server_dispatch.c | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/src/admin/admin_server_dispatch.c b/src/admin/admin_server_dispatch.c
-index b78ff902c0..9f25813ae3 100644
--- a/src/admin/admin_server_dispatch.c
-+++ b/src/admin/admin_server_dispatch.c
-@@ -66,6 +66,28 @@ remoteAdmClientNew(virNetServerClientPtr client ATTRIBUTE_UNUSED,
-                    void *opaque)
- {
-     struct daemonAdmClientPrivate *priv;
-+    uid_t clientuid;
-+    gid_t clientgid;
-+    pid_t clientpid;
-+    unsigned long long timestamp;
-+
-+    if (virNetServerClientGetUNIXIdentity(client,
-+                                          &clientuid,
-+                                          &clientgid,
-+                                          &clientpid,
-+                                          &timestamp) < 0)
-+        return NULL;
-+
-+    VIR_DEBUG("New client pid %lld uid %lld",
-+              (long long)clientpid,
-+              (long long)clientuid);
-+
-+    if (geteuid() != clientuid) {
-+        virReportRestrictedError(_("Disallowing client %lld with uid %lld"),
-+                                 (long long)clientpid,
-+                                 (long long)clientuid);
-+        return NULL;
-+    }
- 
-     if (VIR_ALLOC(priv) < 0)
-         return NULL;
-- 
-2.21.0
-
@@ -1,51 +0,0 @@
-From 41f06e6095e17b61b2af35821d204afc5c34777c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Tue, 30 Apr 2019 16:51:37 +0100
-Subject: [PATCH 2/3] locking: restrict sockets to mode 0600
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The virtlockd daemon's only intended client is the libvirtd daemon. As
-such it should never allow clients from other user accounts to connect.
-The code already enforces this and drops clients from other UIDs, but
-we can get earlier (and thus stronger) protection against DoS by setting
-the socket permissions to 0600
-
-Fixes CVE-2019-10132
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit f111e09468693909b1f067aa575efdafd9a262a1)
---
- src/locking/virtlockd-admin.socket.in | 1 +
- src/locking/virtlockd.socket.in       | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/locking/virtlockd-admin.socket.in b/src/locking/virtlockd-admin.socket.in
-index 2a7500f3d0..f674c492f7 100644
--- a/src/locking/virtlockd-admin.socket.in
-+++ b/src/locking/virtlockd-admin.socket.in
-@@ -5,6 +5,7 @@ Before=libvirtd.service
- [Socket]
- ListenStream=@localstatedir@/run/libvirt/virtlockd-admin-sock
- Service=virtlockd.service
-+SocketMode=0600
- 
- [Install]
- WantedBy=sockets.target
-diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket.in
-index 45e0f20235..d701b27516 100644
--- a/src/locking/virtlockd.socket.in
-+++ b/src/locking/virtlockd.socket.in
-@@ -4,6 +4,7 @@ Before=libvirtd.service
- 
- [Socket]
- ListenStream=@localstatedir@/run/libvirt/virtlockd-sock
-+SocketMode=0600
- 
- [Install]
- WantedBy=sockets.target
-- 
-2.21.0
-
@@ -1,51 +0,0 @@
-From f0e014133104cdb5af5c7d96a7aa6dc0f1bbb03c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Tue, 30 Apr 2019 17:27:41 +0100
-Subject: [PATCH 3/3] logging: restrict sockets to mode 0600
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The virtlogd daemon's only intended client is the libvirtd daemon. As
-such it should never allow clients from other user accounts to connect.
-The code already enforces this and drops clients from other UIDs, but
-we can get earlier (and thus stronger) protection against DoS by setting
-the socket permissions to 0600
-
-Fixes CVE-2019-10132
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit e37bd65f9948c1185456b2cdaa3bd6e875af680f)
---
- src/logging/virtlogd-admin.socket.in | 1 +
- src/logging/virtlogd.socket.in       | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/logging/virtlogd-admin.socket.in b/src/logging/virtlogd-admin.socket.in
-index 595e6c4c4b..5c41dfeb7b 100644
--- a/src/logging/virtlogd-admin.socket.in
-+++ b/src/logging/virtlogd-admin.socket.in
-@@ -5,6 +5,7 @@ Before=libvirtd.service
- [Socket]
- ListenStream=@localstatedir@/run/libvirt/virtlogd-admin-sock
- Service=virtlogd.service
-+SocketMode=0600
- 
- [Install]
- WantedBy=sockets.target
-diff --git a/src/logging/virtlogd.socket.in b/src/logging/virtlogd.socket.in
-index 22b9360c8d..ae48cdab9a 100644
--- a/src/logging/virtlogd.socket.in
-+++ b/src/logging/virtlogd.socket.in
-@@ -4,6 +4,7 @@ Before=libvirtd.service
- 
- [Socket]
- ListenStream=@localstatedir@/run/libvirt/virtlogd-sock
-+SocketMode=0600
- 
- [Install]
- WantedBy=sockets.target
-- 
-2.21.0
-
@@ -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 $$d/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 $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef

 MAKEFILE_COMMON := $(shell $(find-makefile-common))
@@ -0,0 +1 @@
+F-11
@@ -0,0 +1,30 @@
+From 6e80c60b89728de28267242f7373ecf553e40bc1 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange@redhat.com>
+Date: Thu, 28 May 2009 13:15:57 +0000
+Subject: [PATCH] Avoid broken networking with new QEMU/KVM >= 86
+
+(cherry picked from commit 2afc3bfd8b779ddba974da9d66d6ea337fc91c01)
+
+Fedora-patch: libvirt-0.6.2-avoid-broken-networking-with-newer-qemu.patch
+---
+ src/qemu_conf.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/qemu_conf.c b/src/qemu_conf.c
+index fc0e772..99f13c6 100644
+--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
+@@ -658,8 +658,8 @@ qemudNetworkIfaceConnect(virConnectPtr conn,
+     }
+ 
+     snprintf(tapfdstr, sizeof(tapfdstr),
+-             "tap,fd=%d,script=,vlan=%d,ifname=%s",
+-             tapfd, vlan, net->ifname);
+             "tap,fd=%d,vlan=%d",
+             tapfd, vlan);
+ 
+     if (!(retval = strdup(tapfdstr)))
+         goto no_memory;
+-- 
+1.6.2.5
+
@@ -0,0 +1,49 @@
+From 6635abc3bbe54e6b0168182805de92cd70d125e4 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Tue, 12 May 2009 15:31:22 +0000
+Subject: [PATCH] * src/network_driver.c: enable bridges which are not up without an IP address, patch by Ludwig Nussel
+
+(cherry picked from commit e978774ec67f4b062b1f65e5c76a13193a9430eb)
+
+Fedora-patch: libvirt-0.6.2-bring-up-ipless-bridge.patch
+---
+ src/network_driver.c |    9 +++------
+ 1 files changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/src/network_driver.c b/src/network_driver.c
+index a17a769..a163b15 100644
+--- a/src/network_driver.c
+++ b/src/network_driver.c
+@@ -836,8 +836,7 @@ static int networkStartNetworkDaemon(virConnectPtr conn,
+         goto err_delbr;
+     }
+ 
+-    if (network->def->ipAddress &&
+-        (err = brSetInterfaceUp(driver->brctl, network->def->bridge, 1))) {
+    if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 1))) {
+         virReportSystemError(conn, err,
+                              _("failed to bring the bridge '%s' up"),
+                              network->def->bridge);
+@@ -878,8 +877,7 @@ static int networkStartNetworkDaemon(virConnectPtr conn,
+     networkRemoveIptablesRules(driver, network);
+ 
+  err_delbr1:
+-    if (network->def->ipAddress &&
+-        (err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) {
+    if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) {
+         char ebuf[1024];
+         networkLog(NETWORK_WARN, _("Failed to bring down bridge '%s' : %s\n"),
+                  network->def->bridge, virStrerror(err, ebuf, sizeof ebuf));
+@@ -920,8 +918,7 @@ static int networkShutdownNetworkDaemon(virConnectPtr conn,
+     networkRemoveIptablesRules(driver, network);
+ 
+     char ebuf[1024];
+-    if (network->def->ipAddress &&
+-        (err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) {
+    if ((err = brSetInterfaceUp(driver->brctl, network->def->bridge, 0))) {
+         networkLog(NETWORK_WARN, _("Failed to bring down bridge '%s' : %s\n"),
+                  network->def->bridge, virStrerror(err, ebuf, sizeof ebuf));
+     }
+-- 
+1.6.2.5
+
@@ -0,0 +1,33 @@
+From f793cd9b7220145b6df8086d77db4fdc035d680b Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange@redhat.com>
+Date: Tue, 4 Aug 2009 18:13:09 +0100
+Subject: [PATCH] Fix escaping of 8-bit high characters
+
+Fix  https://bugzilla.redhat.com/show_bug.cgi?id=479517
+
+* src/buf.c: Cast to 'unsigned char' before doing compare to
+  avoid rejecting 8-bit high characters
+
+(cherry picked from commit 8feb499ba2c3625632210c997b49f5df515c05d4)
+
+Fedora-patch: libvirt-0.6.2-buf-locale-escape.patch
+---
+ src/buf.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/buf.c b/src/buf.c
+index 259175d..c802aa2 100644
+--- a/src/buf.c
+++ b/src/buf.c
+@@ -304,7 +304,7 @@ virBufferEscapeString(const virBufferPtr buf, const char *format, const char *st
+             *out++ = 'o';
+             *out++ = 's';
+             *out++ = ';';
+-        } else if ((*cur >= 0x20) || (*cur == '\n') || (*cur == '\t') ||
+        } else if (((unsigned char)*cur >= 0x20) || (*cur == '\n') || (*cur == '\t') ||
+                    (*cur == '\r')) {
+             /*
+              * default case, just copy !
+-- 
+1.6.2.5
+
@@ -0,0 +1,208 @@
+From 182a3cac2b4339e988802eb02279e7ab4c883c67 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Thu, 16 Apr 2009 15:56:27 +0000
+Subject: [PATCH] Don't log monitor output to domain log file.
+
+It's logged via the logging system already. Prefix monitor debug output with vm
+name.
+
+(cherry picked from commit 5caa1e0eb050a12fe8ed02cf635bb672a56cdb6f)
+
+Fedora-patch: libvirt-0.6.2-do-not-log-monitor-output.patch
+---
+ src/qemu_driver.c |   60 +++++++++++++++++++++-------------------------------
+ 1 files changed, 24 insertions(+), 36 deletions(-)
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index 5ca3d20..cb738b2 100644
+--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
+@@ -1706,27 +1706,11 @@ qemudMonitorCommandExtra(const virDomainObjPtr vm,
+             goto error;
+         }
+     }
+-
+-    /* Log, but ignore failures to write logfile for VM */
+-    if (safewrite(vm->logfile, buf, strlen(buf)) < 0) {
+-        char ebuf[1024];
+-        VIR_WARN(_("Unable to log VM console data: %s\n"),
+-                 virStrerror(errno, ebuf, sizeof ebuf));
+-    }
+-
+     *reply = buf;
+     return 0;
+ 
+  error:
+-    if (buf) {
+-        /* Log, but ignore failures to write logfile for VM */
+-        if (safewrite(vm->logfile, buf, strlen(buf)) < 0) {
+-            char ebuf[1024];
+-            VIR_WARN(_("Unable to log VM console data: %s\n"),
+-                     virStrerror(errno, ebuf, sizeof ebuf));
+-        }
+-        VIR_FREE(buf);
+-    }
+    VIR_FREE(buf);
+     return -1;
+ }
+ 
+@@ -2461,7 +2445,7 @@ static int qemudDomainGetMemoryBalloon(virConnectPtr conn,
+         goto cleanup;
+     }
+ 
+-    DEBUG ("balloon reply: '%s'", reply);
+    DEBUG ("%s: balloon reply: '%s'", vm->def->name, reply);
+     if ((offset = strstr(reply, BALLOON_PREFIX)) != NULL) {
+         unsigned int memMB;
+         char *end;
+@@ -2515,7 +2499,7 @@ static int qemudDomainSetMemoryBalloon(virConnectPtr conn,
+ 
+     /* If the command failed qemu prints: 'unknown command'
+      * No message is printed on success it seems */
+-    DEBUG ("balloon reply: %s", reply);
+    DEBUG ("%s: balloon reply: %s",vm->def->name,  reply);
+     if (strstr(reply, "\nunknown command:")) {
+         /* Don't set error - it is expected memory balloon fails on many qemu */
+         ret = 0;
+@@ -2810,7 +2794,7 @@ static int qemudDomainSave(virDomainPtr dom,
+         goto cleanup;
+     }
+ 
+-    DEBUG ("migrate reply: %s", info);
+    DEBUG ("%s: migrate reply: %s", vm->def->name, info);
+ 
+     /* If the command isn't supported then qemu prints:
+      * unknown command: migrate" */
+@@ -3662,7 +3646,7 @@ static int qemudDomainChangeEjectableMedia(virConnectPtr conn,
+     /* If the command failed qemu prints:
+      * device not found, device is locked ...
+      * No message is printed on success it seems */
+-    DEBUG ("ejectable media change reply: %s", reply);
+    DEBUG ("%s: ejectable media change reply: %s", vm->def->name, reply);
+     if (strstr(reply, "\ndevice ")) {
+         qemudReportError (conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
+                           _("changing cdrom media failed: %s"), reply);
+@@ -3723,7 +3707,7 @@ static int qemudDomainAttachPciDiskDevice(virConnectPtr conn,
+         return -1;
+     }
+ 
+-    DEBUG ("pci_add reply: %s", reply);
+    DEBUG ("%s: pci_add reply: %s", vm->def->name, reply);
+     /* If the command succeeds qemu prints:
+      * OK bus 0... */
+ #define PCI_ATTACH_OK_MSG "OK bus 0, slot "
+@@ -3791,7 +3775,7 @@ static int qemudDomainAttachUsbMassstorageDevice(virConnectPtr conn,
+         return -1;
+     }
+ 
+-    DEBUG ("attach_usb reply: %s", reply);
+    DEBUG ("%s: attach_usb reply: %s",vm->def->name,  reply);
+     /* If the command failed qemu prints:
+      * Could not add ... */
+     if (strstr(reply, "Could not add ")) {
+@@ -3845,7 +3829,7 @@ static int qemudDomainAttachHostDevice(virConnectPtr conn,
+         return -1;
+     }
+ 
+-    DEBUG ("attach_usb reply: %s", reply);
+    DEBUG ("%s: attach_usb reply: %s", vm->def->name, reply);
+     /* If the command failed qemu prints:
+      * Could not add ... */
+     if (strstr(reply, "Could not add ")) {
+@@ -3984,7 +3968,7 @@ static int qemudDomainDetachPciDiskDevice(virConnectPtr conn,
+         goto cleanup;
+     }
+ 
+-    DEBUG ("pci_del reply: %s", reply);
+    DEBUG ("%s: pci_del reply: %s",vm->def->name,  reply);
+     /* If the command fails due to a wrong slot qemu prints: invalid slot,
+      * nothing is printed on success */
+     if (strstr(reply, "invalid slot")) {
+@@ -4214,7 +4198,7 @@ qemudDomainBlockStats (virDomainPtr dom,
+                           "%s", _("'info blockstats' command failed"));
+         goto cleanup;
+     }
+-    DEBUG ("info blockstats reply: %s", info);
+    DEBUG ("%s: info blockstats reply: %s", vm->def->name, info);
+ 
+     /* If the command isn't supported then qemu prints the supported
+      * info commands, so the output starts "info ".  Since this is
+@@ -4255,21 +4239,25 @@ qemudDomainBlockStats (virDomainPtr dom,
+                 if (STRPREFIX (p, "rd_bytes=")) {
+                     p += 9;
+                     if (virStrToLong_ll (p, &dummy, 10, &stats->rd_bytes) == -1)
+-                        DEBUG ("error reading rd_bytes: %s", p);
+                        DEBUG ("%s: error reading rd_bytes: %s",
+                               vm->def->name, p);
+                 } else if (STRPREFIX (p, "wr_bytes=")) {
+                     p += 9;
+                     if (virStrToLong_ll (p, &dummy, 10, &stats->wr_bytes) == -1)
+-                        DEBUG ("error reading wr_bytes: %s", p);
+                        DEBUG ("%s: error reading wr_bytes: %s",
+                               vm->def->name, p);
+                 } else if (STRPREFIX (p, "rd_operations=")) {
+                     p += 14;
+                     if (virStrToLong_ll (p, &dummy, 10, &stats->rd_req) == -1)
+-                        DEBUG ("error reading rd_req: %s", p);
+                        DEBUG ("%s: error reading rd_req: %s",
+                               vm->def->name, p);
+                 } else if (STRPREFIX (p, "wr_operations=")) {
+                     p += 14;
+                     if (virStrToLong_ll (p, &dummy, 10, &stats->wr_req) == -1)
+-                        DEBUG ("error reading wr_req: %s", p);
+                        DEBUG ("%s: error reading wr_req: %s",
+                               vm->def->name, p);
+                 } else
+-                    DEBUG ("unknown block stat near %s", p);
+                    DEBUG ("%s: unknown block stat near %s", vm->def->name, p);
+ 
+                 /* Skip to next label. */
+                 p = strchr (p, ' ');
+@@ -4481,7 +4469,7 @@ qemudDomainMemoryPeek (virDomainPtr dom,
+         goto cleanup;
+     }
+ 
+-    DEBUG ("memsave reply: %s", info);
+    DEBUG ("%s: memsave reply: %s", vm->def->name, info);
+ 
+     /* Read the memory file into buffer. */
+     if (saferead (fd, buffer, size) == (ssize_t) -1) {
+@@ -4798,7 +4786,7 @@ qemudDomainMigratePerform (virDomainPtr dom,
+                              "%s", _("off-line migration specified, but suspend operation failed"));
+             goto cleanup;
+         }
+-        DEBUG ("stop reply: %s", info);
+        DEBUG ("%s: stop reply: %s", vm->def->name, info);
+         VIR_FREE(info);
+         paused = 1;
+ 
+@@ -4815,7 +4803,7 @@ qemudDomainMigratePerform (virDomainPtr dom,
+         snprintf (cmd, sizeof cmd, "migrate_set_speed %lum", resource);
+         qemudMonitorCommand (vm, cmd, &info);
+ 
+-        DEBUG ("migrate_set_speed reply: %s", info);
+        DEBUG ("%s: migrate_set_speed reply: %s", vm->def->name, info);
+         VIR_FREE (info);
+     }
+ 
+@@ -4834,7 +4822,7 @@ qemudDomainMigratePerform (virDomainPtr dom,
+         goto cleanup;
+     }
+ 
+-    DEBUG ("migrate reply: %s", info);
+    DEBUG ("%s: migrate reply: %s", vm->def->name, info);
+ 
+     /* Now check for "fail" in the output string */
+     if (strstr(info, "fail") != NULL) {
+@@ -4873,7 +4861,7 @@ cleanup:
+                       vm->def->name);
+         }
+         else {
+-            DEBUG ("cont reply: %s", info);
+            DEBUG ("%s: cont reply: %s", vm->def->name, info);
+             VIR_FREE(info);
+         }
+ 
+-- 
+1.6.2.5
+
@@ -0,0 +1,49 @@
+From 2d299525f5de29d11c6dc4810aa41e893535695b Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc@redhat.com>
+Date: Fri, 3 Jul 2009 10:27:46 +0000
+Subject: [PATCH] Don't unnecessarily try to change a file context
+
+As pointed out by Tim Waugh here:
+
+  https://bugzilla.redhat.com/507555
+
+We shouldn't bother trying to set the context of a file if it already
+matches what we want.
+
+(Fixed to use STREQ() and not use tabs, as pointed out by danpb)
+
+(cherry picked from commit add254feeaa830dd5af1118c141cb140bf55b5a7)
+
+Fedora-patch: libvirt-0.6.2-do-not-unnecessarily-try-to-change-a-file-context.patch
+---
+ src/security_selinux.c |   11 ++++++++++-
+ 1 files changed, 10 insertions(+), 1 deletions(-)
+
+diff --git a/src/security_selinux.c b/src/security_selinux.c
+index 450fce2..8ebe1fe 100644
+--- a/src/security_selinux.c
+++ b/src/security_selinux.c
+@@ -280,10 +280,19 @@ static int
+ SELinuxSetFilecon(virConnectPtr conn, const char *path, char *tcon)
+ {
+     char ebuf[1024];
+    security_context_t econ;
+ 
+     VIR_INFO("Setting SELinux context on '%s' to '%s'", path, tcon);
+ 
+-    if(setfilecon(path, tcon) < 0) {
+    if (setfilecon(path, tcon) < 0) {
+        if (getfilecon(path, &econ) >= 0) {
+            if (STREQ(tcon, econ)) {
+                freecon(econ);
+                /* It's alright, there's nothing to change anyway. */
+                return 0;
+            }
+            freecon(econ);
+        }
+         virSecurityReportError(conn, VIR_ERR_ERROR,
+                                _("%s: unable to set security context "
+                                  "'\%s\' on %s: %s."), __func__,
+-- 
+1.6.2.5
+
@@ -0,0 +1,48 @@
+From 9b41d6550b6bf8d4450bb5b86550eb605cc1fd91 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange@redhat.com>
+Date: Fri, 8 May 2009 10:07:15 +0000
+Subject: [PATCH] Enable save/restore/migrate for QEMU >= 0.10.0
+
+(cherry picked from commit 88e22e4e8cb7fc7e1fa1d132778aa1994f4b55b6)
+
+Fedora-patch: libvirt-0.6.2-enable-qemu-0-10-migration.patch
+---
+ src/qemu_conf.c |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/qemu_conf.c b/src/qemu_conf.c
+index 6f9e610..929fe00 100644
+--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
+@@ -472,16 +472,13 @@ int qemudExtractVersionInfo(const char *qemu,
+ 
+     /*
+      * Handling of -incoming arg with varying features
+-     *  -incoming tcp    (kvm >= 79)
+-     *  -incoming exec   (kvm >= 80)
+     *  -incoming tcp    (kvm >= 79, qemu >= 0.10.0)
+     *  -incoming exec   (kvm >= 80, qemu >= 0.10.0)
+      *  -incoming stdio  (all earlier kvm)
+      *
+      * NB, there was a pre-kvm-79 'tcp' support, but it
+      * was broken, because it blocked the monitor console
+      * while waiting for data, so pretend it doesn't exist
+-     *
+-     * XXX when next QEMU release after 0.9.1 arrives,
+-     * we'll need to add MIGRATE_QEMU_TCP/EXEC here too
+      */
+     if (kvm_version >= 79) {
+         flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP;
+@@ -489,6 +486,9 @@ int qemudExtractVersionInfo(const char *qemu,
+             flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC;
+     } else if (kvm_version > 0) {
+         flags |= QEMUD_CMD_FLAG_MIGRATE_KVM_STDIO;
+    } else if (version >= 10000) {
+        flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP;
+        flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC;
+     }
+ 
+     if (retversion)
+-- 
+1.6.2.5
+
@@ -0,0 +1,147 @@
+From 261ec2c9597b2eb6c7d91589fc66e203f60b6735 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange@redhat.com>
+Date: Tue, 12 May 2009 16:41:49 +0000
+Subject: [PATCH] Fix interrupting of main event thread & protect against accidental uniniitalized variables
+
+(cherry picked from commit 0a31be6ba243066378c344882cc1a32802774edb)
+
+Fedora-patch: libvirt-0.6.2-event-handling-1.patch
+---
+ qemud/event.c |   42 +++++++++++++++++++++++++++++++++++-------
+ 1 files changed, 35 insertions(+), 7 deletions(-)
+
+diff --git a/qemud/event.c b/qemud/event.c
+index 0887008..4dc1020 100644
+--- a/qemud/event.c
+++ b/qemud/event.c
+@@ -83,10 +83,10 @@ struct virEventLoop {
+ static struct virEventLoop eventLoop;
+ 
+ /* Unique ID for the next FD watch to be registered */
+-static int nextWatch = 0;
+static int nextWatch = 1;
+ 
+ /* Unique ID for the next timer to be registered */
+-static int nextTimer = 0;
+static int nextTimer = 1;
+ 
+ static void virEventLock(void)
+ {
+@@ -142,15 +142,22 @@ int virEventAddHandleImpl(int fd, int events,
+ 
+ void virEventUpdateHandleImpl(int watch, int events) {
+     int i;
+    EVENT_DEBUG("Update handle w=%d e=%d", watch, events);
+
+    if (watch <= 0) {
+        VIR_WARN("Ignoring invalid update watch %d", watch);
+        return;
+    }
+
+     virEventLock();
+     for (i = 0 ; i < eventLoop.handlesCount ; i++) {
+         if (eventLoop.handles[i].watch == watch) {
+             eventLoop.handles[i].events =
+                     virEventHandleTypeToPollEvent(events);
+            virEventInterruptLocked();
+             break;
+         }
+     }
+-    virEventInterruptLocked();
+     virEventUnlock();
+ }
+ 
+@@ -163,6 +170,12 @@ void virEventUpdateHandleImpl(int watch, int events) {
+ int virEventRemoveHandleImpl(int watch) {
+     int i;
+     EVENT_DEBUG("Remove handle %d", watch);
+
+    if (watch <= 0) {
+        VIR_WARN("Ignoring invalid remove watch %d", watch);
+        return -1;
+    }
+
+     virEventLock();
+     for (i = 0 ; i < eventLoop.handlesCount ; i++) {
+         if (eventLoop.handles[i].deleted)
+@@ -171,11 +184,11 @@ int virEventRemoveHandleImpl(int watch) {
+         if (eventLoop.handles[i].watch == watch) {
+             EVENT_DEBUG("mark delete %d %d", i, eventLoop.handles[i].fd);
+             eventLoop.handles[i].deleted = 1;
+            virEventInterruptLocked();
+             virEventUnlock();
+             return 0;
+         }
+     }
+-    virEventInterruptLocked();
+     virEventUnlock();
+     return -1;
+ }
+@@ -231,6 +244,12 @@ void virEventUpdateTimeoutImpl(int timer, int frequency) {
+     struct timeval tv;
+     int i;
+     EVENT_DEBUG("Updating timer %d timeout with %d ms freq", timer, frequency);
+
+    if (timer <= 0) {
+        VIR_WARN("Ignoring invalid update timer %d", timer);
+        return;
+    }
+
+     if (gettimeofday(&tv, NULL) < 0) {
+         return;
+     }
+@@ -243,10 +262,10 @@ void virEventUpdateTimeoutImpl(int timer, int frequency) {
+                 frequency >= 0 ? frequency +
+                 (((unsigned long long)tv.tv_sec)*1000) +
+                 (((unsigned long long)tv.tv_usec)/1000) : 0;
+            virEventInterruptLocked();
+             break;
+         }
+     }
+-    virEventInterruptLocked();
+     virEventUnlock();
+ }
+ 
+@@ -259,6 +278,12 @@ void virEventUpdateTimeoutImpl(int timer, int frequency) {
+ int virEventRemoveTimeoutImpl(int timer) {
+     int i;
+     EVENT_DEBUG("Remove timer %d", timer);
+
+    if (timer <= 0) {
+        VIR_WARN("Ignoring invalid remove timer %d", timer);
+        return -1;
+    }
+
+     virEventLock();
+     for (i = 0 ; i < eventLoop.timeoutsCount ; i++) {
+         if (eventLoop.timeouts[i].deleted)
+@@ -266,11 +291,11 @@ int virEventRemoveTimeoutImpl(int timer) {
+ 
+         if (eventLoop.timeouts[i].timer == timer) {
+             eventLoop.timeouts[i].deleted = 1;
+            virEventInterruptLocked();
+             virEventUnlock();
+             return 0;
+         }
+     }
+-    virEventInterruptLocked();
+     virEventUnlock();
+     return -1;
+ }
+@@ -616,9 +641,12 @@ static int virEventInterruptLocked(void)
+     char c = '\0';
+ 
+     if (!eventLoop.running ||
+-        pthread_self() == eventLoop.leader)
+        pthread_self() == eventLoop.leader) {
+        VIR_DEBUG("Skip interrupt, %d %d", eventLoop.running, (int)eventLoop.leader);
+         return 0;
+    }
+ 
+    VIR_DEBUG0("Interrupting");
+     if (safewrite(eventLoop.wakeupfd[1], &c, sizeof(c)) != sizeof(c))
+         return -1;
+     return 0;
+-- 
+1.6.2.5
+
@@ -0,0 +1,200 @@
+From ef1a3eaa58d83c3367a1addff6c8132f27aa09dd Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange@redhat.com>
+Date: Tue, 12 May 2009 16:43:04 +0000
+Subject: [PATCH] Fix watch/timer event deletion
+
+(cherry picked from commit 470317f5c71cbcc6b6d8d83d0978aea3510d3698)
+
+Fedora-patch: libvirt-0.6.2-event-handling-2.patch
+---
+ qemud/event.c |  112 ++++++++++++++++++++++++++-------------------------------
+ 1 files changed, 51 insertions(+), 61 deletions(-)
+
+diff --git a/qemud/event.c b/qemud/event.c
+index 4dc1020..8bc7c34 100644
+--- a/qemud/event.c
+++ b/qemud/event.c
+@@ -312,7 +312,7 @@ static int virEventCalculateTimeout(int *timeout) {
+     EVENT_DEBUG("Calculate expiry of %d timers", eventLoop.timeoutsCount);
+     /* Figure out if we need a timeout */
+     for (i = 0 ; i < eventLoop.timeoutsCount ; i++) {
+-        if (eventLoop.timeouts[i].deleted || eventLoop.timeouts[i].frequency < 0)
+        if (eventLoop.timeouts[i].frequency < 0)
+             continue;
+ 
+         EVENT_DEBUG("Got a timeout scheduled for %llu", eventLoop.timeouts[i].expiresAt);
+@@ -349,32 +349,26 @@ static int virEventCalculateTimeout(int *timeout) {
+  * file handles. The caller must free the returned data struct
+  * returns: the pollfd array, or NULL on error
+  */
+-static int virEventMakePollFDs(struct pollfd **retfds) {
+static struct pollfd *virEventMakePollFDs(void) {
+     struct pollfd *fds;
+-    int i, nfds = 0;
+    int i;
+ 
+-    for (i = 0 ; i < eventLoop.handlesCount ; i++) {
+-        if (eventLoop.handles[i].deleted)
+-            continue;
+-        nfds++;
+-    }
+-    *retfds = NULL;
+     /* Setup the poll file handle data structs */
+-    if (VIR_ALLOC_N(fds, nfds) < 0)
+-        return -1;
+    if (VIR_ALLOC_N(fds, eventLoop.handlesCount) < 0)
+        return NULL;
+ 
+-    for (i = 0, nfds = 0 ; i < eventLoop.handlesCount ; i++) {
+-        if (eventLoop.handles[i].deleted)
+-            continue;
+-        fds[nfds].fd = eventLoop.handles[i].fd;
+-        fds[nfds].events = eventLoop.handles[i].events;
+-        fds[nfds].revents = 0;
+    for (i = 0 ; i < eventLoop.handlesCount ; i++) {
+        EVENT_DEBUG("Prepare n=%d w=%d, f=%d e=%d", i,
+                    eventLoop.handles[i].watch,
+                    eventLoop.handles[i].fd,
+                    eventLoop.handles[i].events);
+        fds[i].fd = eventLoop.handles[i].fd;
+        fds[i].events = eventLoop.handles[i].events;
+        fds[i].revents = 0;
+         //EVENT_DEBUG("Wait for %d %d", eventLoop.handles[i].fd, eventLoop.handles[i].events);
+-        nfds++;
+     }
+ 
+-    *retfds = fds;
+-    return nfds;
+    return fds;
+ }
+ 
+ 
+@@ -434,26 +428,30 @@ static int virEventDispatchTimeouts(void) {
+  * Returns 0 upon success, -1 if an error occurred
+  */
+ static int virEventDispatchHandles(int nfds, struct pollfd *fds) {
+-    int i, n;
+    int i;
+ 
+-    for (i = 0, n = 0 ; i < eventLoop.handlesCount && n < nfds ; i++) {
+    /* NB, use nfds not eventLoop.handlesCount, because new
+     * fds might be added on end of list, and they're not
+     * in the fds array we've got */
+    for (i = 0 ; i < nfds ; i++) {
+         if (eventLoop.handles[i].deleted) {
+-            EVENT_DEBUG("Skip deleted %d", eventLoop.handles[i].fd);
+            EVENT_DEBUG("Skip deleted n=%d w=%d f=%d", i,
+                        eventLoop.handles[i].watch, eventLoop.handles[i].fd);
+             continue;
+         }
+ 
+-        if (fds[n].revents) {
+        if (fds[i].revents) {
+             virEventHandleCallback cb = eventLoop.handles[i].cb;
+             void *opaque = eventLoop.handles[i].opaque;
+-            int hEvents = virPollEventToEventHandleType(fds[n].revents);
+-            EVENT_DEBUG("Dispatch %d %d %p", fds[n].fd,
+-                        fds[n].revents, eventLoop.handles[i].opaque);
+            int hEvents = virPollEventToEventHandleType(fds[i].revents);
+            EVENT_DEBUG("Dispatch n=%d f=%d w=%d e=%d %p", i,
+                        fds[i].fd, eventLoop.handles[i].watch,
+                        fds[i].revents, eventLoop.handles[i].opaque);
+             virEventUnlock();
+             (cb)(eventLoop.handles[i].watch,
+-                 fds[n].fd, hEvents, opaque);
+                 fds[i].fd, hEvents, opaque);
+             virEventLock();
+         }
+-        n++;
+     }
+ 
+     return 0;
+@@ -544,22 +542,21 @@ static int virEventCleanupHandles(void) {
+  * at least one file handle has an event, or a timer expires
+  */
+ int virEventRunOnce(void) {
+-    struct pollfd *fds;
+    struct pollfd *fds = NULL;
+     int ret, timeout, nfds;
+ 
+     virEventLock();
+     eventLoop.running = 1;
+     eventLoop.leader = pthread_self();
+-    if ((nfds = virEventMakePollFDs(&fds)) < 0) {
+-        virEventUnlock();
+-        return -1;
+-    }
+ 
+-    if (virEventCalculateTimeout(&timeout) < 0) {
+-        VIR_FREE(fds);
+-        virEventUnlock();
+-        return -1;
+-    }
+    if (virEventCleanupTimeouts() < 0 ||
+        virEventCleanupHandles() < 0)
+        goto error;
+
+    if (!(fds = virEventMakePollFDs()) ||
+        virEventCalculateTimeout(&timeout) < 0)
+        goto error;
+    nfds = eventLoop.handlesCount;
+ 
+     virEventUnlock();
+ 
+@@ -571,38 +568,31 @@ int virEventRunOnce(void) {
+         if (errno == EINTR) {
+             goto retry;
+         }
+-        VIR_FREE(fds);
+-        return -1;
+        goto error_unlocked;
+     }
+ 
+     virEventLock();
+-    if (virEventDispatchTimeouts() < 0) {
+-        VIR_FREE(fds);
+-        virEventUnlock();
+-        return -1;
+-    }
+    if (virEventDispatchTimeouts() < 0)
+        goto error;
+ 
+     if (ret > 0 &&
+-        virEventDispatchHandles(nfds, fds) < 0) {
+-        VIR_FREE(fds);
+-        virEventUnlock();
+-        return -1;
+-    }
+-    VIR_FREE(fds);
+-
+-    if (virEventCleanupTimeouts() < 0) {
+-        virEventUnlock();
+-        return -1;
+-    }
+        virEventDispatchHandles(nfds, fds) < 0)
+        goto error;
+ 
+-    if (virEventCleanupHandles() < 0) {
+-        virEventUnlock();
+-        return -1;
+-    }
+    if (virEventCleanupTimeouts() < 0 ||
+        virEventCleanupHandles() < 0)
+        goto error;
+ 
+     eventLoop.running = 0;
+     virEventUnlock();
+    VIR_FREE(fds);
+     return 0;
+
+error:
+    virEventUnlock();
+error_unlocked:
+    VIR_FREE(fds);
+    return -1;
+ }
+ 
+ static void virEventHandleWakeup(int watch ATTRIBUTE_UNUSED,
+-- 
+1.6.2.5
+
@@ -0,0 +1,137 @@
+From d8bd0cff27c0572e9305e7fdbc6b843f74d9e30f Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange@redhat.com>
+Date: Mon, 29 Jun 2009 10:41:56 +0000
+Subject: [PATCH] Fix crash in QEMU driver with bad capabilities data
+
+(cherry picked from commit 39c7e7a6b79bbdfa36928a430d56fa88a204e8fd)
+
+Fedora-patch: libvirt-0.6.2-fix-libvirtd-crash-with-bad-capabilities-data.patch
+---
+ src/qemu_driver.c |   80 +++++++++++++++++++++++++++++++++++-----------------
+ 1 files changed, 54 insertions(+), 26 deletions(-)
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index cb738b2..3d3675c 100644
+--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
+@@ -360,12 +360,43 @@ next:
+     return 0;
+ }
+ 
+
+static int
+qemudSecurityCapsInit(virSecurityDriverPtr secdrv,
+                      virCapsPtr caps)
+{
+    const char *doi, *model;
+
+    doi = virSecurityDriverGetDOI(secdrv);
+    model = virSecurityDriverGetModel(secdrv);
+
+    caps->host.secModel.model = strdup(model);
+    if (!caps->host.secModel.model) {
+        char ebuf[1024];
+        VIR_ERROR(_("Failed to copy secModel model: %s"),
+                  virStrerror(errno, ebuf, sizeof ebuf));
+        return -1;
+    }
+
+    caps->host.secModel.doi = strdup(doi);
+    if (!caps->host.secModel.doi) {
+        char ebuf[1024];
+        VIR_ERROR(_("Failed to copy secModel DOI: %s"),
+                  virStrerror(errno, ebuf, sizeof ebuf));
+        return -1;
+    }
+
+    VIR_DEBUG("Initialized caps for security driver \"%s\" with "
+              "DOI \"%s\"", model, doi);
+
+    return 0;
+}
+
+
+ static int
+ qemudSecurityInit(struct qemud_driver *qemud_drv)
+ {
+     int ret;
+-    const char *doi, *model;
+-    virCapsPtr caps;
+     virSecurityDriverPtr security_drv;
+ 
+     ret = virSecurityDriverStartup(&security_drv,
+@@ -381,36 +412,17 @@ qemudSecurityInit(struct qemud_driver *qemud_drv)
+     }
+ 
+     qemud_drv->securityDriver = security_drv;
+-    doi = virSecurityDriverGetDOI(security_drv);
+-    model = virSecurityDriverGetModel(security_drv);
+ 
+-    VIR_DEBUG("Initialized security driver \"%s\" with "
+-              "DOI \"%s\"", model, doi);
+    VIR_INFO("Initialized security driver %s", security_drv->name);
+ 
+     /*
+      * Add security policy host caps now that the security driver is
+      * initialized.
+      */
+-    caps = qemud_drv->caps;
+-
+-    caps->host.secModel.model = strdup(model);
+-    if (!caps->host.secModel.model) {
+-        char ebuf[1024];
+-        VIR_ERROR(_("Failed to copy secModel model: %s"),
+-                  virStrerror(errno, ebuf, sizeof ebuf));
+-        return -1;
+-    }
+    return qemudSecurityCapsInit(security_drv, qemud_drv->caps);
+}
+ 
+-    caps->host.secModel.doi = strdup(doi);
+-    if (!caps->host.secModel.doi) {
+-        char ebuf[1024];
+-        VIR_ERROR(_("Failed to copy secModel DOI: %s"),
+-                  virStrerror(errno, ebuf, sizeof ebuf));
+-        return -1;
+-    }
+ 
+-    return 0;
+-}
+ 
+ /**
+  * qemudStartup:
+@@ -1852,13 +1864,29 @@ static int qemudGetNodeInfo(virConnectPtr conn,
+ 
+ static char *qemudGetCapabilities(virConnectPtr conn) {
+     struct qemud_driver *driver = conn->privateData;
+    virCapsPtr caps;
+     char *xml = NULL;
+ 
+     qemuDriverLock(driver);
+    if ((caps = qemudCapsInit()) == NULL) {
+        virReportOOMError(conn);
+        goto cleanup;
+    }
+
+    if (qemu_driver->securityDriver &&
+        qemudSecurityCapsInit(qemu_driver->securityDriver, caps) < 0) {
+        virCapabilitiesFree(caps);
+        virReportOOMError(conn);
+        goto cleanup;
+    }
+
+     virCapabilitiesFree(qemu_driver->caps);
+-    if ((qemu_driver->caps = qemudCapsInit()) == NULL ||
+-        (xml = virCapabilitiesFormatXML(driver->caps)) == NULL)
+    qemu_driver->caps = caps;
+
+    if ((xml = virCapabilitiesFormatXML(driver->caps)) == NULL)
+         virReportOOMError(conn);
+
+cleanup:
+     qemuDriverUnlock(driver);
+ 
+     return xml;
+-- 
+1.6.2.5
+
@@ -0,0 +1,37 @@
+From 99c018831379f23e65860ad4f3628a6d5f1a7d5a Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc@redhat.com>
+Date: Fri, 3 Jul 2009 10:29:09 +0000
+Subject: [PATCH] Skip labelling if no src path present
+
+Fixes startup of guest's with sourceless cdrom devices.
+
+Patch from Cole Robinson originally posted here:
+
+  https://bugzilla.redhat.com/499569
+
+but never sent upstream.
+
+(cherry picked from commit 67d0c6eb9410d5101f4820a7286deacb6398afde)
+
+Fedora-patch: libvirt-0.6.2-fix-nosource-label.patch
+---
+ src/security_selinux.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/security_selinux.c b/src/security_selinux.c
+index 95fa0a6..450fce2 100644
+--- a/src/security_selinux.c
+++ b/src/security_selinux.c
+@@ -338,6 +338,9 @@ SELinuxSetSecurityImageLabel(virConnectPtr conn,
+ {
+     const virSecurityLabelDefPtr secdef = &vm->def->seclabel;
+ 
+    if (!disk->src)
+        return 0;
+
+     if (disk->shared) {
+         return SELinuxSetFilecon(conn, disk->src, default_image_context);
+     } else if (disk->readonly) {
+-- 
+1.6.2.5
+
@@ -0,0 +1,85 @@
+From 9f6a5f50aee13575331f79f5d93635f701646eb7 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange@redhat.com>
+Date: Mon, 11 May 2009 15:14:24 +0000
+Subject: [PATCH] Fix QEMU ARGV detection with kvm >= 85
+
+(cherry picked from commit 426f9772b84752b4901b72fd382ff6e28e258efd)
+
+Fedora-patch: libvirt-0.6.2-fix-qemu-argv-detection-with-kvm-85.patch
+---
+ src/qemu_conf.c   |   18 ++++++++++++++----
+ src/qemu_driver.c |   12 ++----------
+ 2 files changed, 16 insertions(+), 14 deletions(-)
+
+diff --git a/src/qemu_conf.c b/src/qemu_conf.c
+index 929fe00..3e7e32d 100644
+--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
+@@ -431,18 +431,28 @@ int qemudExtractVersionInfo(const char *qemu,
+         return -1;
+ 
+     char *help = NULL;
+-    enum { MAX_HELP_OUTPUT_SIZE = 8192 };
+    enum { MAX_HELP_OUTPUT_SIZE = 1024*64 };
+     int len = virFileReadLimFD(newstdout, MAX_HELP_OUTPUT_SIZE, &help);
+-    if (len < 0)
+    if (len < 0) {
+        virReportSystemError(NULL, errno, "%s",
+                             _("Unable to read QEMU help output"));
+         goto cleanup2;
+    }
+ 
+     if (sscanf(help, "QEMU PC emulator version %u.%u.%u (kvm-%u)",
+                &major, &minor, &micro, &kvm_version) != 4)
+         kvm_version = 0;
+ 
+-    if (!kvm_version && sscanf(help, "QEMU PC emulator version %u.%u.%u",
+-               &major, &minor, &micro) != 3)
+    if (!kvm_version &&
+        sscanf(help, "QEMU PC emulator version %u.%u.%u",
+               &major, &minor, &micro) != 3) {
+        char *eol = strchr(help, '\n');
+        if (eol) *eol = '\0';
+        qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
+                         _("cannot parse QEMU version number in '%s'"),
+                         help);
+         goto cleanup2;
+    }
+ 
+     version = (major * 1000 * 1000) + (minor * 1000) + micro;
+ 
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index 4752a64..5ca3d20 100644
+--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
+@@ -1379,12 +1379,8 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+ 
+     if (qemudExtractVersionInfo(emulator,
+                                 NULL,
+-                                &qemuCmdFlags) < 0) {
+-        qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
+-                         _("Cannot determine QEMU argv syntax %s"),
+-                         emulator);
+                                &qemuCmdFlags) < 0)
+         goto cleanup;
+-    }
+ 
+     if (qemuPrepareHostDevices(conn, vm->def) < 0)
+         goto cleanup;
+@@ -3606,12 +3602,8 @@ static int qemudDomainChangeEjectableMedia(virConnectPtr conn,
+ 
+     if (qemudExtractVersionInfo(vm->def->emulator,
+                                 NULL,
+-                                &qemuCmdFlags) < 0) {
+-        qemudReportError(conn, dom, NULL, VIR_ERR_INTERNAL_ERROR,
+-                         _("Cannot determine QEMU argv syntax %s"),
+-                         vm->def->emulator);
+                                &qemuCmdFlags) < 0)
+         return -1;
+-    }
+ 
+     if (qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE) {
+         if (!(devname = qemudDiskDeviceName(conn, newdisk)))
+-- 
+1.6.2.5
+
@@ -0,0 +1,46 @@
+From 0aac99f8e13dfc74b87986908165ae7f44662153 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange@redhat.com>
+Date: Mon, 6 Jul 2009 16:01:55 +0100
+Subject: [PATCH] Fix SELinux denial during hotplug
+
+* src/qemu_driver.c: Relabel disk images *before* running QEMU
+hotplug monitor commands
+
+(cherry picked from commit 1795bfe4a177a5eff1b3b0a16d56df6f371c0f8e)
+
+Fedora-patch: libvirt-0.6.2-hotplug-labelling.patch
+---
+ src/qemu_driver.c |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index 5fc21a1..f3661f8 100644
+--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
+@@ -3934,10 +3934,14 @@ static int qemudDomainAttachDevice(virDomainPtr dom,
+         switch (dev->data.disk->device) {
+         case VIR_DOMAIN_DISK_DEVICE_CDROM:
+         case VIR_DOMAIN_DISK_DEVICE_FLOPPY:
+            if (driver->securityDriver)
+                driver->securityDriver->domainSetSecurityImageLabel(dom->conn, vm, dev->data.disk);
+             ret = qemudDomainChangeEjectableMedia(dom->conn, vm, dev);
+             break;
+ 
+         case VIR_DOMAIN_DISK_DEVICE_DISK:
+            if (driver->securityDriver)
+                driver->securityDriver->domainSetSecurityImageLabel(dom->conn, vm, dev->data.disk);
+             if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_USB) {
+                 ret = qemudDomainAttachUsbMassstorageDevice(dom->conn, vm, dev);
+             } else if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_SCSI ||
+@@ -3949,8 +3953,6 @@ static int qemudDomainAttachDevice(virDomainPtr dom,
+                                  virDomainDiskBusTypeToString(dev->data.disk->bus));
+                 goto cleanup;
+             }
+-            if (driver->securityDriver)
+-                driver->securityDriver->domainSetSecurityImageLabel(dom->conn, vm, dev->data.disk);
+             break;
+ 
+         default:
+-- 
+1.6.2.5
+
@@ -0,0 +1,134 @@
+From ae80f9ec15b03d9d3ab6cfa2d48529b459a64fb2 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange@redhat.com>
+Date: Mon, 6 Jul 2009 15:58:55 +0100
+Subject: [PATCH] Fix PCI device hotplug/unplug with newer QEMU
+
+* src/qemu_driver.c: Try new monitor syntax for hotplug first. If
+  that fails fallback to old KVM specific syntax
+
+(cherry picked from commit 326ecb78145cfeb7706ef0dcd521b19d934950e7)
+
+Fedora-patch: libvirt-0.6.2-hotplug-monitor-syntax.patch
+---
+ src/qemu_driver.c |   56 +++++++++++++++++++++++++++++++++++++++-------------
+ 1 files changed, 42 insertions(+), 14 deletions(-)
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index f3661f8..8473616 100644
+--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
+@@ -3724,6 +3724,7 @@ static int qemudDomainAttachPciDiskDevice(virConnectPtr conn,
+     char *cmd, *reply, *s;
+     char *safe_path;
+     const char* type = virDomainDiskBusTypeToString(dev->data.disk->bus);
+    int tryOldSyntax = 0;
+ 
+     for (i = 0 ; i < vm->def->ndisks ; i++) {
+         if (STREQ(vm->def->disks[i]->dst, dev->data.disk->dst)) {
+@@ -3738,14 +3739,15 @@ static int qemudDomainAttachPciDiskDevice(virConnectPtr conn,
+         return -1;
+     }
+ 
+try_command:
+     safe_path = qemudEscapeMonitorArg(dev->data.disk->src);
+     if (!safe_path) {
+         virReportOOMError(conn);
+         return -1;
+     }
+ 
+-    ret = virAsprintf(&cmd, "pci_add 0 storage file=%s,if=%s",
+-                      safe_path, type);
+    ret = virAsprintf(&cmd, "pci_add %s storage file=%s,if=%s",
+                      (tryOldSyntax ? "0": "pci_addr=auto"), safe_path, type);
+     VIR_FREE(safe_path);
+     if (ret == -1) {
+         virReportOOMError(conn);
+@@ -3761,17 +3763,27 @@ static int qemudDomainAttachPciDiskDevice(virConnectPtr conn,
+ 
+     DEBUG ("%s: pci_add reply: %s", vm->def->name, reply);
+     /* If the command succeeds qemu prints:
+-     * OK bus 0... */
+-#define PCI_ATTACH_OK_MSG "OK bus 0, slot "
+-    if ((s=strstr(reply, PCI_ATTACH_OK_MSG))) {
+-        char* dummy = s;
+-        s += strlen(PCI_ATTACH_OK_MSG);
+     * OK bus 0, slot XXX...
+     * or
+     * OK domain 0, bus 0, slot XXX
+     */
+    if ((s = strstr(reply, "OK ")) &&
+        (s = strstr(s, "slot "))) {
+        char *dummy = s;
+        s += strlen("slot ");
+ 
+         if (virStrToLong_i ((const char*)s, &dummy, 10, &dev->data.disk->slotnum) == -1)
+             VIR_WARN("%s", _("Unable to parse slot number\n"));
+        /* XXX not neccessarily always going to end up in domain 0 / bus 0 :-( */
+        /* XXX this slotnum is not persistant across restarts :-( */
+    } else if (!tryOldSyntax && strstr(reply, "invalid char in expression")) {
+        VIR_FREE(reply);
+        VIR_FREE(cmd);
+        tryOldSyntax = 1;
+        goto try_command;
+     } else {
+         qemudReportError (conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
+-                          _("adding %s disk failed"), type);
+                          _("adding %s disk failed: %s"), type, reply);
+         VIR_FREE(reply);
+         VIR_FREE(cmd);
+         return -1;
+@@ -3990,6 +4002,7 @@ static int qemudDomainDetachPciDiskDevice(virConnectPtr conn,
+     char *cmd = NULL;
+     char *reply = NULL;
+     virDomainDiskDefPtr detach = NULL;
+    int tryOldSyntax = 0;
+ 
+     for (i = 0 ; i < vm->def->ndisks ; i++) {
+         if (STREQ(vm->def->disks[i]->dst, dev->data.disk->dst)) {
+@@ -4011,9 +4024,17 @@ static int qemudDomainDetachPciDiskDevice(virConnectPtr conn,
+         goto cleanup;
+     }
+ 
+-    if (virAsprintf(&cmd, "pci_del 0 %d", detach->slotnum) < 0) {
+-        virReportOOMError(conn);
+-        goto cleanup;
+try_command:
+    if (tryOldSyntax) {
+        if (virAsprintf(&cmd, "pci_del 0 %d", detach->slotnum) < 0) {
+            virReportOOMError(conn);
+            goto cleanup;
+        }
+    } else {
+        if (virAsprintf(&cmd, "pci_del pci_addr=0:0:%d", detach->slotnum) < 0) {
+            virReportOOMError(conn);
+            goto cleanup;
+        }
+     }
+ 
+     if (qemudMonitorCommand(vm, cmd, &reply) < 0) {
+@@ -4023,12 +4044,19 @@ static int qemudDomainDetachPciDiskDevice(virConnectPtr conn,
+     }
+ 
+     DEBUG ("%s: pci_del reply: %s",vm->def->name,  reply);
+
+    if (!tryOldSyntax &&
+        strstr(reply, "extraneous characters")) {
+        tryOldSyntax = 1;
+        goto try_command;
+    }
+     /* If the command fails due to a wrong slot qemu prints: invalid slot,
+      * nothing is printed on success */
+-    if (strstr(reply, "invalid slot")) {
+    if (strstr(reply, "invalid slot") ||
+        strstr(reply, "Invalid pci address")) {
+         qemudReportError (conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
+-                          _("failed to detach disk %s: invalid slot %d"),
+-                          detach->dst, detach->slotnum);
+                          _("failed to detach disk %s: invalid slot %d: %s"),
+                          detach->dst, detach->slotnum, reply);
+         goto cleanup;
+     }
+ 
+-- 
+1.6.2.5
+
@@ -0,0 +1,57 @@
+From 2c42e4c96efd390fa7a6957692a5863d30a10828 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange@redhat.com>
+Date: Fri, 29 May 2009 14:34:35 +0000
+Subject: [PATCH] Avoid double-free in daemon client cleanup code
+
+(cherry picked from commit 6c3ef350649b959215cfc5ccfdaba35bf9560066)
+
+Fedora-patch: libvirt-0.6.2-libvirtd-double-free.patch
+---
+ qemud/qemud.c |   22 +++++++++++++++++-----
+ 1 files changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/qemud/qemud.c b/qemud/qemud.c
+index 4f04355..e299a67 100644
+--- a/qemud/qemud.c
+++ b/qemud/qemud.c
+@@ -1397,7 +1397,10 @@ static int qemudDispatchServer(struct qemud_server *server, struct qemud_socket
+  * jobs have finished, then clean it up elsehwere
+  */
+ void qemudDispatchClientFailure(struct qemud_client *client) {
+-    virEventRemoveHandleImpl(client->watch);
+    if (client->watch != -1) {
+        virEventRemoveHandleImpl(client->watch);
+        client->watch = -1;
+    }
+ 
+     /* Deregister event delivery callback */
+     if(client->conn) {
+@@ -1406,12 +1409,21 @@ void qemudDispatchClientFailure(struct qemud_client *client) {
+     }
+ 
+ #if HAVE_SASL
+-    if (client->saslconn) sasl_dispose(&client->saslconn);
+    if (client->saslconn) {
+        sasl_dispose(&client->saslconn);
+        client->saslconn = NULL;
+    }
+     free(client->saslUsername);
+    client->saslUsername = NULL;
+ #endif
+-    if (client->tlssession) gnutls_deinit (client->tlssession);
+-    close(client->fd);
+-    client->fd = -1;
+    if (client->tlssession) {
+        gnutls_deinit (client->tlssession);
+        client->tlssession = NULL;
+    }
+    if (client->fd != -1) {
+        close(client->fd);
+        client->fd = -1;
+    }
+ }
+ 
+ 
+-- 
+1.6.2.5
+
@@ -0,0 +1,60 @@
+From eb2fad7e94ba9bf48787e24542931688b9926ca1 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange@redhat.com>
+Date: Mon, 6 Jul 2009 15:45:04 +0100
+Subject: [PATCH] Fix problem with QEMU monitor welcome prompt confusing libvirt after a libvirtd daemon restart with active guests
+
+* src/qemu_driver: Read and dicard pending monitor data
+  before issuing new monitor commands.
+
+(cherry picked from commit 2d1f2e706c8b13571e1227df1c69b2302da35d5a)
+
+Fedora-patch: libvirt-0.6.2-monitor-prompt-discard.patch
+---
+ src/qemu_driver.c |   24 ++++++++++++++++++++++++
+ 1 files changed, 24 insertions(+), 0 deletions(-)
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index 3d3675c..5fc21a1 100644
+--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
+@@ -1636,6 +1636,28 @@ cleanup:
+     qemuDriverUnlock(driver);
+ }
+ 
+
+/* Throw away any data available on the monitor
+ * This is done before executing a command, in order
+ * to allow re-synchronization if something went badly
+ * wrong in the past. it also deals with problem of
+ * QEMU *sometimes* re-printing its initial greeting
+ * when we reconnect to the monitor after restarts.
+ */
+static void
+qemuMonitorDiscardPendingData(virDomainObjPtr vm) {
+    char buf[1024];
+    int ret = 0;
+
+    /* Monitor is non-blocking, so just loop till we
+     * get -1 or 0. Don't bother with detecting
+     * errors, since we'll deal with that better later */
+    do {
+        ret = read(vm->monitor, buf, sizeof (buf)-1);
+    } while (ret > 0);
+}
+
+
+ static int
+ qemudMonitorCommandExtra(const virDomainObjPtr vm,
+                          const char *cmd,
+@@ -1647,6 +1669,8 @@ qemudMonitorCommandExtra(const virDomainObjPtr vm,
+     size_t cmdlen = strlen(cmd);
+     size_t extralen = extra ? strlen(extra) : 0;
+ 
+    qemuMonitorDiscardPendingData(vm);
+
+     if (safewrite(vm->monitor, cmd, cmdlen) != cmdlen)
+         return -1;
+     if (safewrite(vm->monitor, "\r", 1) != 1)
+-- 
+1.6.2.5
+
@@ -0,0 +1,159 @@
+From 3cf2f90a4747547f9877b15c1f573f8a771098e8 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange@redhat.com>
+Date: Mon, 29 Jun 2009 10:41:56 +0000
+Subject: [PATCH] Fix crash in QEMU driver with bad capabilities data
+
+(cherry picked from commit 39c7e7a6b79bbdfa36928a430d56fa88a204e8fd)
+
+Fedora-patch: libvirt-0.6.2-numa-ignore-fail.patch
+---
+ src/capabilities.c       |   16 +++++++++++++---
+ src/capabilities.h       |    3 +++
+ src/libvirt_private.syms |    1 +
+ src/lxc_conf.c           |   11 +++++++++--
+ src/qemu_conf.c          |   10 ++++++++--
+ src/uml_conf.c           |   11 +++++++++--
+ 6 files changed, 43 insertions(+), 9 deletions(-)
+
+diff --git a/src/capabilities.c b/src/capabilities.c
+index d6e3478..8dc32a1 100644
+--- a/src/capabilities.c
+++ b/src/capabilities.c
+@@ -122,6 +122,18 @@ virCapabilitiesFreeGuest(virCapsGuestPtr guest)
+ }
+ 
+ 
+void
+virCapabilitiesFreeNUMAInfo(virCapsPtr caps)
+{
+    int i;
+
+    for (i = 0 ; i < caps->host.nnumaCell ; i++)
+        virCapabilitiesFreeHostNUMACell(caps->host.numaCell[i]);
+    VIR_FREE(caps->host.numaCell);
+    caps->host.nnumaCell = 0;
+}
+
+
+ /**
+  * virCapabilitiesFree:
+  * @caps: object to free
+@@ -141,9 +153,7 @@ virCapabilitiesFree(virCapsPtr caps) {
+     for (i = 0 ; i < caps->host.nfeatures ; i++)
+         VIR_FREE(caps->host.features[i]);
+     VIR_FREE(caps->host.features);
+-    for (i = 0 ; i < caps->host.nnumaCell ; i++)
+-        virCapabilitiesFreeHostNUMACell(caps->host.numaCell[i]);
+-    VIR_FREE(caps->host.numaCell);
+    virCapabilitiesFreeNUMAInfo(caps);
+ 
+     for (i = 0 ; i < caps->host.nmigrateTrans ; i++)
+         VIR_FREE(caps->host.migrateTrans[i]);
+diff --git a/src/capabilities.h b/src/capabilities.h
+index 5b0bbab..1b49666 100644
+--- a/src/capabilities.h
+++ b/src/capabilities.h
+@@ -118,6 +118,9 @@ extern void
+ virCapabilitiesFree(virCapsPtr caps);
+ 
+ extern void
+virCapabilitiesFreeNUMAInfo(virCapsPtr caps);
+
+extern void
+ virCapabilitiesSetMacPrefix(virCapsPtr caps,
+                             unsigned char *prefix);
+ 
+diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
+index 350a931..9249a1a 100644
+--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
+@@ -24,6 +24,7 @@ virCapabilitiesDefaultGuestEmulator;
+ virCapabilitiesDefaultGuestMachine;
+ virCapabilitiesFormatXML;
+ virCapabilitiesFree;
+virCapabilitiesFreeNUMAInfo;
+ virCapabilitiesNew;
+ virCapabilitiesSetMacPrefix;
+ virCapabilitiesGenerateMac;
+diff --git a/src/lxc_conf.c b/src/lxc_conf.c
+index 34c8aea..fe721e3 100644
+--- a/src/lxc_conf.c
+++ b/src/lxc_conf.c
+@@ -30,6 +30,7 @@
+ #include "lxc_conf.h"
+ #include "nodeinfo.h"
+ #include "virterror_internal.h"
+#include "logging.h"
+ 
+ #define VIR_FROM_THIS VIR_FROM_LXC
+ 
+@@ -46,8 +47,14 @@ virCapsPtr lxcCapsInit(void)
+                                    0, 0)) == NULL)
+         goto no_memory;
+ 
+-    if (virCapsInitNUMA(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 (virCapsInitNUMA(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/qemu_conf.c b/src/qemu_conf.c
+index 99f13c6..1194e36 100644
+--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
+@@ -376,8 +376,14 @@ virCapsPtr qemudCapsInit(void) {
+     /* Using KVM's mac prefix for QEMU too */
+     virCapabilitiesSetMacPrefix(caps, (unsigned char[]){ 0x52, 0x54, 0x00 });
+ 
+-    if (virCapsInitNUMA(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 (virCapsInitNUMA(caps) < 0) {
+        virCapabilitiesFreeNUMAInfo(caps);
+        VIR_WARN0("Failed to query host NUMA topology, disabling NUMA capabilities");
+    }
+ 
+     /* First the pure HVM guests */
+     for (i = 0 ; i < ARRAY_CARDINALITY(arch_info_hvm) ; i++)
+diff --git a/src/uml_conf.c b/src/uml_conf.c
+index c0d086e..9dd4967 100644
+--- a/src/uml_conf.c
+++ b/src/uml_conf.c
+@@ -44,6 +44,7 @@
+ #include "memory.h"
+ #include "nodeinfo.h"
+ #include "verify.h"
+#include "logging.h"
+ 
+ #define VIR_FROM_THIS VIR_FROM_UML
+ 
+@@ -62,8 +63,14 @@ virCapsPtr umlCapsInit(void) {
+                                    0, 0)) == NULL)
+         goto no_memory;
+ 
+-    if (virCapsInitNUMA(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 (virCapsInitNUMA(caps) < 0) {
+        virCapabilitiesFreeNUMAInfo(caps);
+        VIR_WARN0("Failed to query host NUMA topology, disabling NUMA capabilities");
+    }
+ 
+     if ((guest = virCapabilitiesAddGuest(caps,
+                                          "uml",
+-- 
+1.6.2.5
+
@@ -0,0 +1,31 @@
+From d5d67ea357d92759d4a9ecb213e577835f961eed Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange@redhat.com>
+Date: Thu, 16 Jul 2009 13:23:32 +0100
+Subject: [PATCH] Fix free of unitialized data upon PCI open fail
+
+(cherry picked from commit 4a7acedd3c59a6a750576cb8680bc3f08fe0b52c)
+
+Fedora-patch: libvirt-0.6.2-pci-device-crash.patch
+---
+ src/pci.c |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/src/pci.c b/src/pci.c
+index ed64d68..68a380d 100644
+--- a/src/pci.c
+++ b/src/pci.c
+@@ -829,10 +829,8 @@ pciReadDeviceID(pciDevice *dev, const char *id_name)
+              dev->name, id_name);
+ 
+     /* ID string is '0xNNNN\n' ... i.e. 7 bytes */
+-    if (virFileReadAll(path, 7, &id_str) < 7) {
+-        VIR_FREE(id_str);
+    if (virFileReadAll(path, 7, &id_str) < 0)
+         return NULL;
+-    }
+ 
+     /* Check for 0x suffix */
+     if (id_str[0] != '0' || id_str[1] != 'x') {
+-- 
+1.6.2.5
+
@@ -0,0 +1,31 @@
+From bf7b58a2471a07111f8022c0176f45ee5dc5fe71 Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc@redhat.com>
+Date: Thu, 16 Apr 2009 14:21:35 +0000
+Subject: [PATCH] qemu -drive takes format= not fmt=
+
+Seems like a simple typo - it has been "format=" since the flag
+was introduced, but we added it as "fmt=".
+
+(cherry picked from commit 9fa79000ecc883c699a6cb1ce7f00c34881bc8fe)
+
+Fedora-patch: libvirt-0.6.2-qemu-drive-format.patch
+---
+ src/qemu_conf.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/qemu_conf.c b/src/qemu_conf.c
+index f36c927..6f9e610 100644
+--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
+@@ -1135,7 +1135,7 @@ int qemudBuildCommandLine(virConnectPtr conn,
+                 disk->device == VIR_DOMAIN_DISK_DEVICE_DISK)
+                 virBufferAddLit(&opt, ",boot=on");
+             if (disk->driverType)
+-                virBufferVSprintf(&opt, ",fmt=%s", disk->driverType);
+                virBufferVSprintf(&opt, ",format=%s", disk->driverType);
+ 
+             if (disk->cachemode) {
+                 const char *mode =
+-- 
+1.6.2.5
+
@@ -0,0 +1,176 @@
+From 1f1a0ca63c5492c7d41a0cdbd452a2743f314ebc Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange@redhat.com>
+Date: Fri, 8 May 2009 10:11:14 +0000
+Subject: [PATCH] Improve name & UUID uniqueness checking in QEMU driver
+
+(cherry picked from commit 54ebbde1e18ec831ff2fddb44ec27ed5dde7874a)
+
+Fedora-patch: libvirt-0.6.2-qemu-name-uniqueness.patch
+---
+ src/qemu_driver.c |  103 ++++++++++++++++++++++++++++++++++++++++++----------
+ 1 files changed, 83 insertions(+), 20 deletions(-)
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index 8473616..dfd19c5 100644
+--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
+@@ -2174,22 +2174,37 @@ static virDomainPtr qemudDomainCreate(virConnectPtr conn, const char *xml,
+     if (virSecurityDriverVerify(conn, def) < 0)
+         goto cleanup;
+ 
+-    vm = virDomainFindByName(&driver->domains, def->name);
+-    if (vm) {
+-        qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
+-                         _("domain '%s' is already defined"),
+-                         def->name);
+-        goto cleanup;
+-    }
+    /* See if a VM with matching UUID already exists */
+     vm = virDomainFindByUUID(&driver->domains, def->uuid);
+     if (vm) {
+-        char uuidstr[VIR_UUID_STRING_BUFLEN];
+        /* UUID matches, but if names don't match, refuse it */
+        if (STRNEQ(vm->def->name, def->name)) {
+            char uuidstr[VIR_UUID_STRING_BUFLEN];
+            virUUIDFormat(vm->def->uuid, uuidstr);
+            qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
+                             _("domain '%s' is already defined with uuid %s"),
+                             vm->def->name, uuidstr);
+            goto cleanup;
+        }
+ 
+-        virUUIDFormat(def->uuid, uuidstr);
+-        qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
+-                         _("domain with uuid '%s' is already defined"),
+-                         uuidstr);
+-        goto cleanup;
+        /* UUID & name match, but if VM is already active, refuse it */
+        if (virDomainIsActive(vm)) {
+            qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
+                             _("domain is already active as '%s'"), vm->def->name);
+            goto cleanup;
+        }
+        virDomainObjUnlock(vm);
+    } else {
+        /* UUID does not match, but if a name matches, refuse it */
+        vm = virDomainFindByName(&driver->domains, def->name);
+        if (vm) {
+            char uuidstr[VIR_UUID_STRING_BUFLEN];
+            virUUIDFormat(vm->def->uuid, uuidstr);
+            qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
+                             _("domain '%s' is already defined with uuid %s"),
+                             def->name, uuidstr);
+            goto cleanup;
+        }
+     }
+ 
+     if (!(vm = virDomainAssignDef(conn,
+@@ -2368,6 +2383,11 @@ static int qemudDomainDestroy(virDomainPtr dom) {
+                          _("no domain with matching id %d"), dom->id);
+         goto cleanup;
+     }
+    if (!virDomainIsActive(vm)) {
+        qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
+                         "%s", _("domain is not running"));
+        goto cleanup;
+    }
+ 
+     qemudShutdownVMDaemon(dom->conn, driver, vm);
+     event = virDomainEventNewFromObj(vm,
+@@ -3272,17 +3292,36 @@ static int qemudDomainRestore(virConnectPtr conn,
+         goto cleanup;
+     }
+ 
+-    /* Ensure the name and UUID don't already exist in an active VM */
+    /* See if a VM with matching UUID already exists */
+     vm = virDomainFindByUUID(&driver->domains, def->uuid);
+-    if (!vm)
+-        vm = virDomainFindByName(&driver->domains, def->name);
+     if (vm) {
+        /* UUID matches, but if names don't match, refuse it */
+        if (STRNEQ(vm->def->name, def->name)) {
+            char uuidstr[VIR_UUID_STRING_BUFLEN];
+            virUUIDFormat(vm->def->uuid, uuidstr);
+            qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
+                             _("domain '%s' is already defined with uuid %s"),
+                             vm->def->name, uuidstr);
+            goto cleanup;
+        }
+
+        /* UUID & name match, but if VM is already active, refuse it */
+         if (virDomainIsActive(vm)) {
+             qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
+                              _("domain is already active as '%s'"), vm->def->name);
+             goto cleanup;
+-        } else {
+-            virDomainObjUnlock(vm);
+        }
+        virDomainObjUnlock(vm);
+    } else {
+        /* UUID does not match, but if a name matches, refuse it */
+        vm = virDomainFindByName(&driver->domains, def->name);
+        if (vm) {
+            char uuidstr[VIR_UUID_STRING_BUFLEN];
+            virUUIDFormat(vm->def->uuid, uuidstr);
+            qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
+                             _("domain '%s' is already defined with uuid %s"),
+                             def->name, uuidstr);
+            goto cleanup;
+         }
+     }
+ 
+@@ -3470,18 +3509,41 @@ static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char *xml) {
+     if (virSecurityDriverVerify(conn, def) < 0)
+         goto cleanup;
+ 
+-    vm = virDomainFindByName(&driver->domains, def->name);
+    /* See if a VM with matching UUID already exists */
+    vm = virDomainFindByUUID(&driver->domains, def->uuid);
+     if (vm) {
+        /* UUID matches, but if names don't match, refuse it */
+        if (STRNEQ(vm->def->name, def->name)) {
+            char uuidstr[VIR_UUID_STRING_BUFLEN];
+            virUUIDFormat(vm->def->uuid, uuidstr);
+            qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
+                             _("domain '%s' is already defined with uuid %s"),
+                             vm->def->name, uuidstr);
+            goto cleanup;
+        }
+
+        /* UUID & name match */
+         virDomainObjUnlock(vm);
+         newVM = 0;
+    } else {
+        /* UUID does not match, but if a name matches, refuse it */
+        vm = virDomainFindByName(&driver->domains, def->name);
+        if (vm) {
+            char uuidstr[VIR_UUID_STRING_BUFLEN];
+            virUUIDFormat(vm->def->uuid, uuidstr);
+            qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
+                             _("domain '%s' is already defined with uuid %s"),
+                             def->name, uuidstr);
+            goto cleanup;
+        }
+     }
+ 
+     if (!(vm = virDomainAssignDef(conn,
+                                   &driver->domains,
+                                   def))) {
+-        virDomainDefFree(def);
+         goto cleanup;
+     }
+    def = NULL;
+     vm->persistent = 1;
+ 
+     if (virDomainSaveConfig(conn,
+@@ -3503,6 +3565,7 @@ static virDomainPtr qemudDomainDefine(virConnectPtr conn, const char *xml) {
+     if (dom) dom->id = vm->def->id;
+ 
+ cleanup:
+    virDomainDefFree(def);
+     if (vm)
+         virDomainObjUnlock(vm);
+     if (event)
+-- 
+1.6.2.5
+
@@ -0,0 +1,56 @@
+From 5c1ff776a3194bcc5d593aedd36cd676f1fcab64 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Fri, 29 May 2009 13:32:06 +0000
+Subject: [PATCH] PPC Qemu Machine Type update * src/qemu_conf.c docs/schemas/domain.rng tests/capabilityschemadata/caps-qemu-kvm.xml: PPC Qemu Machine Type changed from g3bw to g3beige some time ago, patch by Thomas Baker
+
+(cherry picked from commit 525c3d40a97a1ccce7c4dc314d2dd9e780b50d41)
+
+Fedora-patch: libvirt-0.6.2-qemu-ppc-machine-type.patch
+---
+ docs/schemas/domain.rng                      |    2 +-
+ src/qemu_conf.c                              |    2 +-
+ tests/capabilityschemadata/caps-qemu-kvm.xml |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng
+index 2f784e1..b29079a 100644
+--- a/docs/schemas/domain.rng
+++ b/docs/schemas/domain.rng
+@@ -184,7 +184,7 @@
+       </attribute>
+       <attribute name="machine">
+         <choice>
+-          <value>g3bw</value>
+          <value>g3beige</value>
+           <value>mac99</value>
+           <value>prep</value>
+         </choice>
+diff --git a/src/qemu_conf.c b/src/qemu_conf.c
+index 3e7e32d..fc0e772 100644
+--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
+@@ -192,7 +192,7 @@ static const char *const arch_info_hvm_sparc_machines[] = {
+     "sun4m"
+ };
+ static const char *const arch_info_hvm_ppc_machines[] = {
+-    "g3bw", "mac99", "prep"
+    "g3beige", "mac99", "prep"
+ };
+ 
+ static const char *const arch_info_xen_x86_machines[] = {
+diff --git a/tests/capabilityschemadata/caps-qemu-kvm.xml b/tests/capabilityschemadata/caps-qemu-kvm.xml
+index fd8523e..893f9ed 100644
+--- a/tests/capabilityschemadata/caps-qemu-kvm.xml
+++ b/tests/capabilityschemadata/caps-qemu-kvm.xml
+@@ -81,7 +81,7 @@
+     <arch name='ppc'>
+       <wordsize>32</wordsize>
+       <emulator>/usr/bin/qemu-system-ppc</emulator>
+-      <machine>g3bw</machine>
+      <machine>g3beige</machine>
+       <machine>mac99</machine>
+       <machine>prep</machine>
+       <domain type='qemu'>
+-- 
+1.6.2.5
+
@@ -0,0 +1,100 @@
+From 36cf92efa2b22f275bdc56411d9704e530cdb3fa Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc@redhat.com>
+Date: Fri, 3 Jul 2009 10:26:37 +0000
+Subject: [PATCH] Re-label shared and readonly images
+
+This patch was posted ages ago here:
+
+  https://bugzilla.redhat.com/493692
+
+But was never posted upstream AFAICT.
+
+Patch from Dan Berrange
+
+(cherry picked from commit 547147084d03ebf30d09d242a5a721a4df664ffe)
+
+Fedora-patch: libvirt-0.6.2-shared-readonly-label.patch
+---
+ src/security_selinux.c |   26 +++++++++++++++++++-------
+ 1 files changed, 19 insertions(+), 7 deletions(-)
+
+diff --git a/src/security_selinux.c b/src/security_selinux.c
+index ac317d7..95fa0a6 100644
+--- a/src/security_selinux.c
+++ b/src/security_selinux.c
+@@ -24,11 +24,12 @@
+ #include "virterror_internal.h"
+ #include "util.h"
+ #include "memory.h"
+-
+#include "logging.h"
+ 
+ #define VIR_FROM_THIS VIR_FROM_SECURITY
+ 
+ static char default_domain_context[1024];
+static char default_content_context[1024];
+ static char default_image_context[1024];
+ #define SECURITY_SELINUX_VOID_DOI       "0"
+ #define SECURITY_SELINUX_NAME "selinux"
+@@ -148,8 +149,13 @@ SELinuxInitialize(virConnectPtr conn)
+     close(fd);
+ 
+     ptr = strchrnul(default_image_context, '\n');
+-    *ptr = '\0';
+-
+    if (*ptr == '\n') {
+        *ptr = '\0';
+        strcpy(default_content_context, ptr+1);
+        ptr = strchrnul(default_content_context, '\n');
+        if (*ptr == '\n')
+            *ptr = '\0';
+    }
+     return 0;
+ }
+ 
+@@ -275,6 +281,8 @@ SELinuxSetFilecon(virConnectPtr conn, const char *path, char *tcon)
+ {
+     char ebuf[1024];
+ 
+    VIR_INFO("Setting SELinux context on '%s' to '%s'", path, tcon);
+
+     if(setfilecon(path, tcon) < 0) {
+         virSecurityReportError(conn, VIR_ERR_ERROR,
+                                _("%s: unable to set security context "
+@@ -299,6 +307,8 @@ SELinuxRestoreSecurityImageLabel(virConnectPtr conn,
+     char *newpath = NULL;
+     const char *path = disk->src;
+ 
+    /* Don't restore labels on readoly/shared disks, because
+     * other VMs may still be accessing these */
+     if (disk->readonly || disk->shared)
+         return 0;
+ 
+@@ -328,8 +338,13 @@ SELinuxSetSecurityImageLabel(virConnectPtr conn,
+ {
+     const virSecurityLabelDefPtr secdef = &vm->def->seclabel;
+ 
+-    if (secdef->imagelabel)
+    if (disk->shared) {
+        return SELinuxSetFilecon(conn, disk->src, default_image_context);
+    } else if (disk->readonly) {
+        return SELinuxSetFilecon(conn, disk->src, default_content_context);
+    } else if (secdef->imagelabel) {
+         return SELinuxSetFilecon(conn, disk->src, secdef->imagelabel);
+    }
+ 
+     return 0;
+ }
+@@ -403,9 +418,6 @@ SELinuxSetSecurityLabel(virConnectPtr conn,
+ 
+     if (secdef->imagelabel) {
+         for (i = 0 ; i < vm->def->ndisks ; i++) {
+-            if (vm->def->disks[i]->readonly ||
+-                vm->def->disks[i]->shared) continue;
+-
+             if (SELinuxSetSecurityImageLabel(conn, vm, vm->def->disks[i]) < 0)
+                 return -1;
+         }
+-- 
+1.6.2.5
+
@@ -0,0 +1,51 @@
+From e76837af35d692cb947db3a47058bcfbbf77b46a Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange@redhat.com>
+Date: Mon, 17 Aug 2009 08:52:30 +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.2-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 1194e36..f42aeaa 100644
+--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
+@@ -795,6 +795,20 @@ int qemudBuildCommandLine(virConnectPtr conn,
+     char domid[50];
+     char *pidfile;
+     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 (vm->def->nsounds &&
+            !soundWarned) {
+            soundWarned = 1;
+            VIR_WARN0("Sound cards for VMs are disabled while SELinux security model is active");
+        }
+    }
+ 
+     uname_normalize(&ut);
+ 
+@@ -1441,7 +1455,8 @@ int qemudBuildCommandLine(virConnectPtr conn,
+     }
+ 
+     /* Add sound hardware */
+-    if (vm->def->nsounds) {
+    if (vm->def->nsounds &&
+        !skipSound) {
+         int size = 100;
+         char *modstr;
+         if (VIR_ALLOC_N(modstr, size+1) < 0)
+-- 
+1.6.2.5
+
@@ -0,0 +1,49 @@
+From a7d81a2f9e80942c9951c1d16ad69c66b9a47bbb Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard@redhat.com>
+Date: Wed, 13 May 2009 16:19:59 +0000
+Subject: [PATCH] * src/buf.c: avoid an XML attribute escaping bug #499791 daniel
+
+(cherry picked from commit 7afe94e7e236ec465d838e7d60e961975c526ab2)
+
+Fedora-patch: libvirt-0.6.2-xml-attribute-escaping.patch
+---
+ src/buf.c |   16 +++++++++++++++-
+ 1 files changed, 15 insertions(+), 1 deletions(-)
+
+diff --git a/src/buf.c b/src/buf.c
+index cdcdac9..259175d 100644
+--- a/src/buf.c
+++ b/src/buf.c
+@@ -266,7 +266,7 @@ virBufferEscapeString(const virBufferPtr buf, const char *format, const char *st
+         return;
+ 
+     len = strlen(str);
+-    if (VIR_ALLOC_N(escaped, 5 * len + 1) < 0) {
+    if (VIR_ALLOC_N(escaped, 6 * len + 1) < 0) {
+         virBufferNoMemory(buf);
+         return;
+     }
+@@ -290,6 +290,20 @@ virBufferEscapeString(const virBufferPtr buf, const char *format, const char *st
+             *out++ = 'm';
+             *out++ = 'p';
+             *out++ = ';';
+        } else if (*cur == '"') {
+            *out++ = '&';
+            *out++ = 'q';
+            *out++ = 'u';
+            *out++ = 'o';
+            *out++ = 't';
+            *out++ = ';';
+        } else if (*cur == '\'') {
+            *out++ = '&';
+            *out++ = 'a';
+            *out++ = 'p';
+            *out++ = 'o';
+            *out++ = 's';
+            *out++ = ';';
+         } else if ((*cur >= 0x20) || (*cur == '\n') || (*cur == '\t') ||
+                    (*cur == '\r')) {
+             /*
+-- 
+1.6.2.5
+
@@ -0,0 +1,47 @@
+From b3f02d5528c121bcf7b9ac5c4284517e71a5e2f2 Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc@redhat.com>
+Date: Wed, 6 May 2009 15:56:20 +0000
+Subject: [PATCH] Fix qemu driver's interpretation of <hostdev managed='yes'/>
+
+This change:
+
+  Tue Mar  3 08:55:13 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
+
+       Don't try to detach & reset PCI devices while running test
+       suite for XML-> ARGV conversion.
+       * src/qemu_driver.c: Add qemuPrepareHostDevices() helper to
+       detach and reset PCI devices.
+       * src/qemu_conf.c: Don't detach & reset PCI devices while
+       building the command line argv
+
+accidentally did this:
+
+-            if (hostdev->managed) {
+        if (!hostdev->managed) {
+
+Which results in managed='yes' not causing the device to be
+detached when the guest is starting.
+
+(cherry picked from commit 1d6c713b18741f1a0e3d0ccd094275a11aef138c)
+
+Fedora-patch: libvirt-0.6.3-hostdev-managed.patch
+---
+ src/qemu_driver.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index 79ee072..162d072 100644
+--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
+@@ -1215,7 +1215,7 @@ static int qemuPrepareHostDevices(virConnectPtr conn,
+         if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
+             continue;
+ 
+-        if (!hostdev->managed) {
+        if (hostdev->managed) {
+             pciDevice *dev = pciGetDevice(conn,
+                                           hostdev->source.subsys.u.pci.domain,
+                                           hostdev->source.subsys.u.pci.bus,
+-- 
+1.6.2.5
+
@@ -0,0 +1,85 @@
+From a521796bac21f0c8af38a8551a420d87b61c7a9a Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Wed, 6 May 2009 14:20:34 +0000
+Subject: [PATCH] Refresh QEMU driver capabilities for each getCapabilities call.
+
+Also fix up a couple issues where caps are accessed without locking
+the driver structure.
+
+(cherry picked from commit 4f107590243631869677ddea2bb667db4a1282a6)
+
+Fedora-patch: libvirt-0.6.3-refresh-qemu-caps.patch
+---
+ src/qemu_driver.c |   28 ++++++++++++++++++++--------
+ 1 files changed, 20 insertions(+), 8 deletions(-)
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index 162d072..4752a64 100644
+--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
+@@ -1872,10 +1872,12 @@ static int qemudGetNodeInfo(virConnectPtr conn,
+ 
+ static char *qemudGetCapabilities(virConnectPtr conn) {
+     struct qemud_driver *driver = conn->privateData;
+-    char *xml;
+    char *xml = NULL;
+ 
+     qemuDriverLock(driver);
+-    if ((xml = virCapabilitiesFormatXML(driver->caps)) == NULL)
+    virCapabilitiesFree(qemu_driver->caps);
+    if ((qemu_driver->caps = qemudCapsInit()) == NULL ||
+        (xml = virCapabilitiesFormatXML(driver->caps)) == NULL)
+         virReportOOMError(conn);
+     qemuDriverUnlock(driver);
+ 
+@@ -3142,20 +3144,26 @@ cleanup:
+     return ret;
+ }
+ 
+-static int qemudNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr secmodel)
+static int qemudNodeGetSecurityModel(virConnectPtr conn,
+                                     virSecurityModelPtr secmodel)
+ {
+     struct qemud_driver *driver = (struct qemud_driver *)conn->privateData;
+     char *p;
+    int ret = 0;
+ 
+-    if (!driver->securityDriver)
+-        return -2;
+    qemuDriverLock(driver);
+    if (!driver->securityDriver) {
+        ret = -2;
+        goto cleanup;
+    }
+ 
+     p = driver->caps->host.secModel.model;
+     if (strlen(p) >= VIR_SECURITY_MODEL_BUFLEN-1) {
+         qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
+                          _("security model string exceeds max %d bytes"),
+                          VIR_SECURITY_MODEL_BUFLEN-1);
+-        return -1;
+        ret = -1;
+        goto cleanup;
+     }
+     strcpy(secmodel->model, p);
+ 
+@@ -3164,10 +3172,14 @@ static int qemudNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr sec
+         qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
+                          _("security DOI string exceeds max %d bytes"),
+                          VIR_SECURITY_DOI_BUFLEN-1);
+-        return -1;
+        ret = -1;
+        goto cleanup;
+     }
+     strcpy(secmodel->doi, p);
+-    return 0;
+
+cleanup:
+    qemuDriverUnlock(driver);
+    return ret;
+ }
+ 
+ /* TODO: check seclabel restore */
+-- 
+1.6.2.5
+
@@ -0,0 +1,60 @@
+From b77d11b221862343d304e11ed878e2f176101f24 Mon Sep 17 00:00:00 2001
+From: Daniel P. Berrange <berrange@redhat.com>
+Date: Tue, 28 Apr 2009 10:55:45 +0000
+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 cb4a6614fae48d05f09b7b15328ea6ef4071ccb3)
+(cherry picked from commit 097c818bf00b3777778ffc32fea3a6ed1e741e2b)
+
+Fedora-patch: libvirt-add-space-to-nodedev-list-tree.patch
+---
+ src/virsh.c |   10 ++++++----
+ 1 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/virsh.c b/src/virsh.c
+index 26764a7..c92bb8f 100644
+--- a/src/virsh.c
+++ b/src/virsh.c
+@@ -4460,10 +4460,12 @@ cmdNodeListDevicesPrint(vshControl *ctl,
+     if (depth && depth < MAX_DEPTH) {
+         indentBuf[indentIdx] = '+';
+         indentBuf[indentIdx+1] = '-';
+        indentBuf[indentIdx+2] = ' ';
+        indentBuf[indentIdx+3] = '\0';
+     }
+ 
+     /* Print this device */
+-    vshPrint(ctl, indentBuf);
+    vshPrint(ctl, "%s", indentBuf);
+     vshPrint(ctl, "%s\n", devices[devid]);
+ 
+ 
+@@ -4487,8 +4489,8 @@ cmdNodeListDevicesPrint(vshControl *ctl,
+ 
+     /* If there is a child device, then print another blank line */
+     if (nextlastdev != -1) {
+-        vshPrint(ctl, indentBuf);
+-        vshPrint(ctl, "  |\n");
+        vshPrint(ctl, "%s", indentBuf);
+        vshPrint(ctl, " |\n");
+     }
+ 
+     /* Finally print all children */
+@@ -4511,7 +4513,7 @@ cmdNodeListDevicesPrint(vshControl *ctl,
+     /* If there was no child device, and we're the last in
+      * a list of devices, then print another blank line */
+     if (nextlastdev == -1 && devid == lastdev) {
+-        vshPrint(ctl, indentBuf);
+        vshPrint(ctl, "%s", indentBuf);
+         vshPrint(ctl, "\n");
+     }
+ }
+-- 
+1.6.2.5
+
@@ -0,0 +1,812 @@
+From 6878a049e27f2eaea7bd3d5c266a2d2b39e444f1 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 9249a1a..75ddda8 100644
+--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
+@@ -240,7 +240,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 1dddb08..1e68261 100644
+--- a/src/pci.c
+++ b/src/pci.c
+@@ -58,6 +58,7 @@ struct _pciDevice {
+     unsigned      pci_pm_cap_pos;
+     unsigned      has_flr : 1;
+     unsigned      has_pm_reset : 1;
+    unsigned      managed : 1;
+ };
+ 
+ /* For virReportOOMError()  and virReportSystemError() */
+@@ -220,7 +221,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.
+@@ -231,7 +232,8 @@ static int
+ pciIterDevices(virConnectPtr conn,
+                pciIterPredicate predicate,
+                pciDevice *dev,
+-               pciDevice **matched)
+               pciDevice **matched,
+               void *data)
+ {
+     DIR *dir;
+     struct dirent *entry;
+@@ -249,7 +251,7 @@ pciIterDevices(virConnectPtr conn,
+ 
+     while ((entry = readdir(dir))) {
+         unsigned domain, bus, slot, function;
+-        pciDevice *try;
+        pciDevice *check;
+ 
+         /* Ignore '.' and '..' */
+         if (entry->d_name[0] == '.')
+@@ -261,18 +263,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;
+@@ -374,63 +376,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;
+ }
+ 
+@@ -438,9 +447,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;
+@@ -450,10 +461,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;
+     }
+ 
+@@ -567,10 +578,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;
+ 
+@@ -589,7 +608,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();
+@@ -885,8 +904,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 70fe9c8..cde326d 100644
+--- a/src/qemu_conf.h
+++ b/src/qemu_conf.h
+@@ -34,6 +34,7 @@
+ #include "domain_event.h"
+ #include "threads.h"
+ #include "security.h"
+#include "pci.h"
+ 
+ #define qemudDebug(fmt, ...) do {} while(0)
+ 
+@@ -90,6 +91,8 @@ struct qemud_driver {
+ 
+     char *securityDriverName;
+     virSecurityDriverPtr securityDriver;
+
+    pciDeviceList *activePciHostdevs;
+ };
+ 
+ /* Status needed to reconenct to running VMs */
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index 9f87d2a..7dbf4a2 100644
+--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
+@@ -126,6 +126,9 @@ static int qemudDomainSetMemoryBalloon(virConnectPtr conn,
+                                        virDomainObjPtr vm,
+                                        unsigned long newmem);
+ 
+static int qemuUpdateActivePciHostdevs(struct qemud_driver *driver,
+                                       virDomainDefPtr def);
+
+ static struct qemud_driver *qemu_driver = NULL;
+ 
+ 
+@@ -334,6 +337,10 @@ qemudReconnectVMs(struct qemud_driver *driver)
+         if ((vm->logfile = qemudLogFD(NULL, driver->logDir, vm->def->name)) < 0)
+             goto next_error;
+ 
+        if (qemuUpdateActivePciHostdevs(driver, vm->def) < 0) {
+            goto next_error;
+        }
+
+         if (vm->def->id >= driver->nextvmid)
+             driver->nextvmid = vm->def->id + 1;
+ 
+@@ -515,6 +522,9 @@ qemudStartup(void) {
+     if ((qemu_driver->caps = qemudCapsInit()) == NULL)
+         goto out_of_memory;
+ 
+    if ((qemu_driver->activePciHostdevs = pciDeviceListNew(NULL)) == NULL)
+        goto error;
+
+     if (qemudLoadDriverConfig(qemu_driver, driverConf) < 0) {
+         goto error;
+     }
+@@ -627,6 +637,7 @@ qemudShutdown(void) {
+         return -1;
+ 
+     qemuDriverLock(qemu_driver);
+    pciDeviceListFree(NULL, qemu_driver->activePciHostdevs);
+     virCapabilitiesFree(qemu_driver->caps);
+ 
+     virDomainObjListFree(&qemu_driver->domains);
+@@ -1209,48 +1220,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;
+@@ -1265,95 +1244,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 int qemudDomainSetSecurityLabel(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm)
+@@ -1468,7 +1503,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+                                 &qemuCmdFlags) < 0)
+         goto cleanup;
+ 
+-    if (qemuPrepareHostDevices(conn, vm->def) < 0)
+    if (qemuPrepareHostDevices(conn, driver, vm->def) < 0)
+         goto cleanup;
+ 
+     vm->def->id = driver->nextvmid++;
+@@ -1634,7 +1669,7 @@ static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED,
+         VIR_FREE(vm->def->seclabel.imagelabel);
+     }
+ 
+-    qemuDomainReAttachHostDevices(conn, vm->def);
+    qemuDomainReAttachHostDevices(conn, driver, vm->def);
+ 
+     if (qemudRemoveDomainStatus(conn, driver, vm) < 0) {
+         VIR_WARN(_("Failed to remove domain status for %s"),
+@@ -5247,6 +5282,7 @@ out:
+ static int
+ qemudNodeDeviceReset (virNodeDevicePtr dev)
+ {
+    struct qemud_driver *driver = dev->conn->privateData;
+     pciDevice *pci;
+     unsigned domain, bus, slot, function;
+     int ret = -1;
+@@ -5258,11 +5294,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 e708980..ba8c769 100644
+--- a/src/xen_unified.c
+++ b/src/xen_unified.c
+@@ -1529,7 +1529,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
+
@@ -0,0 +1,121 @@
+From d79f35fbd4eaf610972621b042993d00f3247d5c 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 68a380d..f78ab9f 100644
+--- a/src/pci.c
+++ b/src/pci.c
+@@ -397,29 +397,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)
+@@ -524,7 +501,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;
+@@ -532,16 +509,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);
+@@ -599,14 +566,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
+
@@ -0,0 +1,31 @@
+From 1319852c443c432d44a2e73508f3be742027f780 Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc@redhat.com>
+Date: Wed, 19 Aug 2009 11:28:02 +0100
+Subject: [PATCH] Don't overwrite error in qemudWaitForMonitor()
+
+May help diagnose https://bugzilla.redhat.com/515054
+
+Fedora-patch: libvirt-do-not-overwrite-error-in-wait-for-monitor.patch
+---
+ src/qemu_driver.c |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index dfd19c5..74e106a 100644
+--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
+@@ -985,8 +985,9 @@ static int qemudWaitForMonitor(virConnectPtr conn,
+         return 0;
+ 
+     /* Unexpected end of file - inform user of QEMU log data */
+-    qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
+-                     _("unable to start guest: %s"), buf);
+    if (!virGetLastError())
+        qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
+                         _("unable to start guest: %s"), buf);
+     return -1;
+ }
+ 
+-- 
+1.6.2.5
+
@@ -0,0 +1,53 @@
+From 2754da03d65f216271c81ece791b96a19272c812 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 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 qemudDomainDetachPciDiskDevice()
+
+(cherry picked from commit 4e12af5623e4a962a6bb911af06fa29aa85befba)
+
+Fedora-patch: libvirt-fix-device-list-update-after-detach.patch
+---
+ src/qemu_driver.c |   21 ++++++++++-----------
+ 1 files changed, 10 insertions(+), 11 deletions(-)
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index dfd19c5..ce04beb 100644
+--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
+@@ -4123,18 +4123,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:
+-- 
+1.6.2.5
+
@@ -0,0 +1,141 @@
+From 9f80bab3829b97ac2802c15b9f3e4a6bbbb24627 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 f78ab9f..1dddb08 100644
+--- a/src/pci.c
+++ b/src/pci.c
+@@ -451,15 +451,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;
+     }
+ 
+@@ -470,7 +473,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;
+     }
+ 
+@@ -487,9 +492,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);
+@@ -511,7 +519,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;
+     }
+ 
+@@ -528,8 +538,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;
+ }
+@@ -577,10 +591,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 ddd3693..9f87d2a 100644
+--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
+@@ -1345,9 +1345,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
+
@@ -0,0 +1,124 @@
+From 1e44604c0d4c2d4c1347c2a1027f1ea02a6499f9 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 ce04beb..ddd3693 100644
+--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
+@@ -1282,6 +1282,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 int qemudDomainSetSecurityLabel(virConnectPtr conn, struct qemud_driver *driver, virDomainObjPtr vm)
+ {
+     if (vm->def->seclabel.label != NULL)
+@@ -1560,6 +1634,8 @@ static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED,
+         VIR_FREE(vm->def->seclabel.imagelabel);
+     }
+ 
+    qemuDomainReAttachHostDevices(conn, vm->def);
+
+     if (qemudRemoveDomainStatus(conn, driver, vm) < 0) {
+         VIR_WARN(_("Failed to remove domain status for %s"),
+                  vm->def->name);
+-- 
+1.6.2.5
+
@@ -1 +1 @@
-SHA512 (libvirt-4.1.0.tar.xz) = 62d1a228adf3270cc6defe3cbf92dac8c4ce2c434c4d97219571ccef799a4f6304cfd1ba9938338356641285f53ac71145d7b398523021c5ea1dc8e3d49cf894
+3035b484861516a1cd425acef1e760e3  libvirt-0.6.2.tar.gz
Author	SHA1	Message	Date
Mark McLoughlin	529d097d28	* Wed Aug 19 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.2-16.fc11 - Allow PCI bus reset to reset other devices (#499678) - Fix stupid PCI reset error message (bug #499678) - Allow PM reset on multi-function PCI devices (bug #515689) - Re-attach PCI host devices after guest shuts down (bug #499561) - Fixes list corruption after disk hot-unplug - Fix minor 'virsh nodedev-list --tree' annoyance	2009-08-19 16:15:46 +00:00
Mark McLoughlin	3eb78ffd37	Sync patches from git	2009-08-17 08:08:56 +00:00
Daniel P. Berrange	8841355697	Log and ignore NUMA topology problems (rhbz #506590 )	2009-08-13 16:07:23 +00:00
Daniel P. Berrange	40a867daeb	Misc important fixes from BZ - Fix crash when attaching/detaching non-existant PCI device (rhbz #510907) - Fix QEMU guest name/uuid uniqueness checks (rhbz #507405) - Fix to use correct pci_add/del syntax for QEMU (rhbz #499669) - Relabel disks before hotplugging them to guest (rhbz #496442) - Correctly handle 8-bit high bytes when escaping XML (rhbz #479517)	2009-08-05 15:48:14 +00:00
Mark McLoughlin	60e1b2cda5	* Fri Jul 3 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.2-13.fc11 - Fix libvirtd crash with bad capabilities data (bug #505635) - Don't unnecessarily try to change a file context (bug #507555)	2009-07-03 10:05:41 +00:00
Mark McLoughlin	c8361aee7d	* Fri Jun 5 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.2-12.fc11 - Use the correct QEMU machine type for ppc (bug #502862) - Fix crash with TLS connections (bug #503066) - Fix broken networking with newer qemu releases (bug #503275) - Remove the qemu BuildRequires	2009-06-05 11:47:31 +00:00
Mark McLoughlin	bda88aaa38	* Mon May 25 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.2-11.fc11 - Bring up the bridge, even if it doesn't have an IP address (bug #501912)	2009-05-25 15:23:17 +00:00
Mark McLoughlin	ca4d795c85	* Fri May 22 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.2-10.fc11 - Don't log monitor output to domain log file (bug #499584)	2009-05-22 09:24:30 +00:00
Mark McLoughlin	e2e196d813	* Thu May 21 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.2-9.fc11 - Fix qemu argv detection with latest qemu (bug #501923) - Fix XML attribute escaping (bug #499791) - Fix serious event handling issues causing guests to be destroyed (bug #499698)	2009-05-21 12:07:19 +00:00
Cole Robinson	a5a2a38a5e	Don't try to label a disk with no path (e.g. empty cdrom) (bug #499569 )	2009-05-11 02:28:23 +00:00
Mark McLoughlin	30f098460c	* Thu May 7 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.2-7.fc11 - Enable migration for qemu 0.10 (bug #499704)	2009-05-07 19:08:42 +00:00
Cole Robinson	7017c99a1e	Refresh qemu caps when getCapabilities is called (bug #460649 )	2009-05-06 16:32:34 +00:00
Mark McLoughlin	1c41ce6f30	* Wed May 6 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.2-5.fc11 - Fix handling of <hostdev managed='yes'> (bug #499386)	2009-05-06 15:51:47 +00:00
Daniel P. Berrange	c6db79d97f	Fix labelling of shared/readonly disks (rhbz #493692 )	2009-05-05 13:01:15 +00:00
Daniel Veillard	7b7f8cc27f	- Fix missing directories in spec (#496945 and gtk-doc) Daniel	2009-04-28 10:57:59 +00:00
Mark McLoughlin	a9cc41b082	* Thu Apr 16 2009 Mark McLoughlin <markmc@redhat.com> - 0.6.2-2.fc11 - Fix qemu drive format specification (#496092)	2009-04-16 15:26:45 +00:00
Jesse Keating	ce1593f88f	Initialize branch F-11 for libvirt	2009-04-15 07:13:06 +00:00