Fix systemd socket permissions (CVE-2019-10132)

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

.cvsignore

@@ -1,18 +0,0 @@
-.build*.log
-*.rpm
-i686
-x86_64
-libvirt-*.tar.gz
-libvirt-0.6.0.tar.gz
-libvirt-0.6.1.tar.gz
-libvirt-0.6.2.tar.gz
-libvirt-0.6.3.tar.gz
-libvirt-0.6.4.tar.gz
-libvirt-0.6.5.tar.gz
-libvirt-0.7.0.tar.gz
-libvirt-0.7.1.tar.gz
-libvirt-0.7.2.tar.gz
-libvirt-0.7.3.tar.gz
-libvirt-0.7.4.tar.gz
-libvirt-0.7.5.tar.gz
-libvirt-0.7.6.tar.gz

.gitignore

@@ -0,0 +1,5 @@
+.build*.log
+*.rpm
+i686
+x86_64
+libvirt-*.tar.xz

0001-cpu-define-the-ssbd-CPUID-feature-bit-CVE-2018-3639.patch

@@ -0,0 +1,32 @@
+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'>

0002-tests-force-use-of-NORMAL-TLS-priority-in-test-suite.patch

@@ -0,0 +1,65 @@
+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);
+ 

0003-cpu-define-the-virt-ssbd-CPUID-feature-bit-CVE-2018-.patch

@@ -0,0 +1,42 @@
+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'>

0004-lockd-fix-typo-in-virtlockd-admin.socket.patch

@@ -0,0 +1,31 @@
+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

0005-nwfilter-increase-pcap-buffer-size-to-be-compatible-.patch

@@ -0,0 +1,105 @@
+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) {

0006-util-don-t-check-for-parallel-iteration-in-hash-rela.patch

@@ -0,0 +1,253 @@
+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);

0007-esx-Fix-double-free-and-freeing-static-strings-in-es.patch

@@ -0,0 +1,64 @@
+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;
+ }
+ 

0008-cpu_x86-Do-not-cache-microcode-version.patch

@@ -0,0 +1,55 @@
+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
+

0009-qemu-Don-t-cache-microcode-version.patch

@@ -0,0 +1,155 @@
+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
+

0010-cputest-Add-data-for-Intel-R-Xeon-R-CPU-E3-1225-v5.patch

@@ -0,0 +1,886 @@
+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
+

0011-cpu_map-Define-md-clear-CPUID-bit.patch

@@ -0,0 +1,105 @@
+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
+

0012-cpu-remove-stibp-flag-from-test-data.patch

@@ -0,0 +1,56 @@
+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
+

0013-admin-reject-clients-unless-their-UID-matches-the-cu.patch

@@ -0,0 +1,58 @@
+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
+

0014-locking-restrict-sockets-to-mode-0600.patch

@@ -0,0 +1,51 @@
+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
+

0015-logging-restrict-sockets-to-mode-0600.patch

@@ -0,0 +1,51 @@
+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
+

branch

@@ -1 +0,0 @@
-F-13

libvirt-0.7.7-audio-config.patch

@@ -1,163 +0,0 @@
-commit 377bc412ce10845930346744e30fe9c4790e5e63
-Author: Cole Robinson <crobinso@redhat.com>
-Date:   Wed May 19 16:03:52 2010 -0400
-
-    daemon: Export SDL audio environment variables
-    
-    /etc/sysconfig/libvirtd has a few environment variables for configuring
-    libvirt SDL audio. The libvirtd process doesn't see these, however, because
-    they are never exported. Let's export the variables after sourcing the
-    sysconfig script.
-    
-    There is another problem here that the commented out values in the
-    sysconfig script are not neccessarily the actual defaults, we are qemus
-    mercy here. Not sure how to solve that.
-
-diff --git a/daemon/libvirtd.init.in b/daemon/libvirtd.init.in
-index 809433e..aa7870c 100644
---- a/daemon/libvirtd.init.in
-+++ b/daemon/libvirtd.init.in
-@@ -45,6 +45,9 @@ KRB5_KTNAME=/etc/libvirt/krb5.tab
- 
- test -f @sysconfdir@/sysconfig/libvirtd && . @sysconfdir@/sysconfig/libvirtd
- 
-+export QEMU_AUDIO_DRV
-+export SDL_AUDIODRIVER
-+
- LIBVIRTD_CONFIG_ARGS=
- if [ -n "$LIBVIRTD_CONFIG" ]
- then
-commit 7f44743c524faa493d05eaf026f1e90a807e502b
-Author: Cole Robinson <crobinso@redhat.com>
-Date:   Wed May 26 10:51:36 2010 -0400
-
-    daemon: sysconf: Update comment about VNC audio
-
-diff --git a/daemon/libvirtd.sysconf b/daemon/libvirtd.sysconf
-index 28080a0..b730c5e 100644
---- a/daemon/libvirtd.sysconf
-+++ b/daemon/libvirtd.sysconf
-@@ -11,7 +11,8 @@
- # Override the QEMU/SDL default audio driver probing when
- # starting virtual machines using SDL graphics
- #
--# NB these have no effect for VMs using VNC
-+# NB these have no effect for VMs using VNC, unless vnc_allow_host_audio
-+# is enabled in /etc/libvirt/qemu.conf
- #QEMU_AUDIO_DRV=sdl
- #
- #SDL_AUDIODRIVER=pulse
-commit fb3ebd0397980ae035e66f0008b09e13377ef80f
-Author: Cole Robinson <crobinso@redhat.com>
-Date:   Wed May 19 16:41:01 2010 -0400
-
-    qemu: Allow using regular audio backends with VNC
-    
-    Currently all host audio backends are disabled if a VM is using VNC, in
-    favor of the QEMU VNC audio extension. Unfortunately no released VNC
-    client supports this extension, so users have no way of getting audio
-    to work if using VNC.
-    
-    Add a new config option in qemu.conf which allows changing libvirt's
-    behavior, but keep the default intact.
-    
-    v2: Fix doc typos, change name to vnc_allow_host_audio
-
-diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug
-index 5bd60b3..551cc20 100644
---- a/src/qemu/libvirtd_qemu.aug
-+++ b/src/qemu/libvirtd_qemu.aug
-@@ -38,6 +38,7 @@ module Libvirtd_qemu =
-                  | str_entry "save_image_format"
-                  | str_entry "hugetlbfs_mount"
-                  | bool_entry "relaxed_acs_check"
-+                 | bool_entry "vnc_allow_host_audio"
- 
-    (* Each enty in the config is one of the following three ... *)
-    let entry = vnc_entry
-diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf
-index 3da332f..98a1176 100644
---- a/src/qemu/qemu.conf
-+++ b/src/qemu/qemu.conf
-@@ -168,3 +168,13 @@
- # be assigned to guests.
- #
- # relaxed_acs_check = 1
-+
-+
-+# QEMU implements an extension for providing audio over a VNC connection,
-+# though if your VNC client does not support it, your only chance for getting
-+# sound output is through regular audio backends. By default, libvirt will
-+# disable all QEMU sound backends if using VNC, since they can cause
-+# permissions issues. Enabling this option will make libvirtd honor the
-+# QEMU_AUDIO_DRV environment variable when using VNC.
-+#
-+# vnc_allow_host_audio = 0
-diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
-index 2755545..b4d8e74 100644
---- a/src/qemu/qemu_conf.c
-+++ b/src/qemu/qemu_conf.c
-@@ -351,6 +351,10 @@ int qemudLoadDriverConfig(struct qemud_driver *driver,
-     CHECK_TYPE ("relaxed_acs_check", VIR_CONF_LONG);
-     if (p) driver->relaxedACS = p->l;
- 
-+    p = virConfGetValue (conf, "vnc_allow_host_audio");
-+    CHECK_TYPE ("vnc_allow_host_audio", VIR_CONF_LONG);
-+    if (p) driver->vncAllowHostAudio = p->l;
-+
-     virConfFree (conf);
-     return 0;
- }
-@@ -4399,12 +4403,15 @@ int qemudBuildCommandLine(virConnectPtr conn,
-             ADD_ARG_LIT(def->graphics[0]->data.vnc.keymap);
-         }
- 
--        /* QEMU implements a VNC extension for providing audio, so we
--         * set the audio backend to none, to prevent it opening the
--         * host OS audio devices since that causes security issues
--         * and is non-sensical when using VNC.
-+        /* Unless user requested it, set the audio backend to none, to
-+         * prevent it opening the host OS audio devices, since that causes
-+         * security issues and might not work when using VNC.
-          */
--        ADD_ENV_LIT("QEMU_AUDIO_DRV=none");
-+        if (driver->vncAllowHostAudio) {
-+            ADD_ENV_COPY("QEMU_AUDIO_DRV");
-+        } else {
-+            ADD_ENV_LIT("QEMU_AUDIO_DRV=none");
-+        }
-     } else if ((def->ngraphics == 1) &&
-                def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) {
-         char *xauth = NULL;
-diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
-index 8fd8d79..7fb4de5 100644
---- a/src/qemu/qemu_conf.h
-+++ b/src/qemu/qemu_conf.h
-@@ -138,6 +138,8 @@ struct qemud_driver {
- 
-     unsigned int relaxedACS : 1;
- 
-+    unsigned int vncAllowHostAudio : 1;
-+
-     virCapsPtr caps;
- 
-     /* An array of callbacks */
-diff --git a/src/qemu/test_libvirtd_qemu.aug b/src/qemu/test_libvirtd_qemu.aug
-index 2feedc0..a048ae5 100644
---- a/src/qemu/test_libvirtd_qemu.aug
-+++ b/src/qemu/test_libvirtd_qemu.aug
-@@ -97,6 +97,8 @@ save_image_format = \"gzip\"
- hugetlbfs_mount = \"/dev/hugepages\"
- 
- relaxed_acs_check = 1
-+
-+vnc_allow_host_audio = 1
- "
- 
-    test Libvirtd_qemu.lns get conf =
-@@ -204,3 +206,5 @@ relaxed_acs_check = 1
- { "hugetlbfs_mount" = "/dev/hugepages" }
- { "#empty" }
- { "relaxed_acs_check" = "1" }
-+{ "#empty" }
-+{ "vnc_allow_host_audio" = "1" }

libvirt-0.7.7-caps-option.patch

@@ -1,110 +0,0 @@
-diff -rup libvirt-0.7.7/src/qemu/libvirtd_qemu.aug new/src/qemu/libvirtd_qemu.aug
---- libvirt-0.7.7/src/qemu/libvirtd_qemu.aug	2010-06-17 12:38:52.998946000 -0400
-+++ new/src/qemu/libvirtd_qemu.aug	2010-06-17 12:39:28.504148000 -0400
-@@ -39,6 +39,7 @@ module Libvirtd_qemu =
-                  | str_entry "hugetlbfs_mount"
-                  | bool_entry "relaxed_acs_check"
-                  | bool_entry "vnc_allow_host_audio"
-+                 | bool_entry "clear_emulator_capabilities"
- 
-    (* Each enty in the config is one of the following three ... *)
-    let entry = vnc_entry
-diff -rup libvirt-0.7.7/src/qemu/qemu.conf new/src/qemu/qemu.conf
---- libvirt-0.7.7/src/qemu/qemu.conf	2010-06-17 12:38:53.001953000 -0400
-+++ new/src/qemu/qemu.conf	2010-06-17 12:39:28.508149000 -0400
-@@ -178,3 +178,12 @@
- # QEMU_AUDIO_DRV environment variable when using VNC.
- #
- # vnc_allow_host_audio = 0
-+
-+# If clear_emulator_capabilities is enabled, libvirt will drop all
-+# privileged capabilities of the QEmu/KVM emulator. This is enabled by
-+# default.
-+#
-+# Warning: Disabling this option means that a compromised guest can
-+# exploit the privileges and possibly do damage to the host.
-+#
-+# clear_emulator_capabilities = 1
-diff -rup libvirt-0.7.7/src/qemu/qemu_conf.c new/src/qemu/qemu_conf.c
---- libvirt-0.7.7/src/qemu/qemu_conf.c	2010-06-17 12:38:53.010946000 -0400
-+++ new/src/qemu/qemu_conf.c	2010-06-17 12:39:28.526151000 -0400
-@@ -103,6 +103,7 @@ int qemudLoadDriverConfig(struct qemud_d
- 
-     /* Setup critical defaults */
-     driver->dynamicOwnership = 1;
-+    driver->clearEmulatorCapabilities = 1;
- 
-     if (!(driver->vncListen = strdup("127.0.0.1"))) {
-         virReportOOMError();
-@@ -354,6 +355,10 @@ int qemudLoadDriverConfig(struct qemud_d
-     CHECK_TYPE ("vnc_allow_host_audio", VIR_CONF_LONG);
-     if (p) driver->vncAllowHostAudio = p->l;
- 
-+    p = virConfGetValue (conf, "clear_emulator_capabilities");
-+    CHECK_TYPE ("clear_emulator_capabilities", VIR_CONF_LONG);
-+    if (p) driver->clearEmulatorCapabilities = p->l;
-+
-     virConfFree (conf);
-     return 0;
- }
-diff -rup libvirt-0.7.7/src/qemu/qemu_conf.h new/src/qemu/qemu_conf.h
---- libvirt-0.7.7/src/qemu/qemu_conf.h	2010-06-17 12:38:53.015945000 -0400
-+++ new/src/qemu/qemu_conf.h	2010-06-17 12:39:28.531146000 -0400
-@@ -129,8 +129,8 @@ struct qemud_driver {
-     ebtablesContext *ebtables;
- 
-     unsigned int relaxedACS : 1;
--
-     unsigned int vncAllowHostAudio : 1;
-+    unsigned int clearEmulatorCapabilities : 1;
- 
-     virCapsPtr caps;
- 
-diff -rup libvirt-0.7.7/src/qemu/qemu_driver.c new/src/qemu/qemu_driver.c
---- libvirt-0.7.7/src/qemu/qemu_driver.c	2010-06-17 12:38:52.988953000 -0400
-+++ new/src/qemu/qemu_driver.c	2010-06-17 12:39:28.542147000 -0400
-@@ -2699,7 +2699,7 @@ static int qemudStartVMDaemon(virConnect
-                               int stdin_fd) {
-     const char **argv = NULL, **tmp;
-     const char **progenv = NULL;
--    int i, ret;
-+    int i, ret, runflags;
-     struct stat sb;
-     int *tapfds = NULL;
-     int ntapfds = 0;
-@@ -2893,9 +2893,16 @@ static int qemudStartVMDaemon(virConnect
-     for (i = 0 ; i < ntapfds ; i++)
-         FD_SET(tapfds[i], &keepfd);
- 
-+    VIR_DEBUG("Clear emulator capabilities: %d",
-+              driver->clearEmulatorCapabilities);
-+    runflags = VIR_EXEC_NONBLOCK;
-+    if (driver->clearEmulatorCapabilities) {
-+        runflags |= VIR_EXEC_CLEAR_CAPS;
-+    }
-+
-     ret = virExecDaemonize(argv, progenv, &keepfd, &child,
-                            stdin_fd, &logfile, &logfile,
--                           VIR_EXEC_NONBLOCK | VIR_EXEC_CLEAR_CAPS,
-+                           runflags,
-                            qemudSecurityHook, &hookData,
-                            pidfile);
-     VIR_FREE(pidfile);
-diff -rup libvirt-0.7.7/src/qemu/test_libvirtd_qemu.aug new/src/qemu/test_libvirtd_qemu.aug
---- libvirt-0.7.7/src/qemu/test_libvirtd_qemu.aug	2010-06-17 12:38:53.018948000 -0400
-+++ new/src/qemu/test_libvirtd_qemu.aug	2010-06-17 12:39:28.546145000 -0400
-@@ -99,6 +99,8 @@ hugetlbfs_mount = \"/dev/hugepages\"
- relaxed_acs_check = 1
- 
- vnc_allow_host_audio = 1
-+
-+clear_emulator_capabilities = 0
- "
- 
-    test Libvirtd_qemu.lns get conf =
-@@ -208,3 +210,5 @@ vnc_allow_host_audio = 1
- { "relaxed_acs_check" = "1" }
- { "#empty" }
- { "vnc_allow_host_audio" = "1" }
-+{ "#empty" }
-+{ "clear_emulator_capabilities" = "0" }

libvirt-0.7.7-fix-cdrom-change.patch

@@ -1,132 +0,0 @@
-commit c4896d378b921ba6471562d7b17641be121c19d6
-Author: Daniel P. Berrange <berrange@redhat.com>
-Date:   Thu Apr 15 11:35:07 2010 +0100
-
-    Fix CDROM media change for QEMU when using -device syntax
-    
-    Disk devices in QEMU have two parts, the guest device and the host
-    backend driver. Historically these two parts have had the same
-    "unique" name. With the switch to using -device though, they now
-    have separate names. Thus when changing CDROM media, for guests
-    using -device syntax, we need to prepend the QEMU_DRIVE_HOST_PREFIX
-    constant
-    
-    * src/qemu/qemu_conf.c, src/qemu/qemu_conf.h: Add helper function
-      qemuDeviceDriveHostAlias() for building a host backend alias
-    * src/qemu/qemu_driver.c: Use qemuDeviceDriveHostAlias() to determine
-      the host backend alias for performing eject/change commands in the
-      monitor
-
-diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
-index 1a8b4aa..0cbedf2 100644
---- a/src/qemu/qemu_conf.c
-+++ b/src/qemu/qemu_conf.c
-@@ -1699,6 +1699,26 @@ static int qemuAssignDeviceDiskAliasLegacy(virDomainDiskDefPtr disk)
- }
- 
- 
-+char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk,
-+                               unsigned long long qemudCmdFlags)
-+{
-+    char *ret;
-+
-+    if (qemudCmdFlags & QEMUD_CMD_FLAG_DEVICE) {
-+        if (virAsprintf(&ret, "%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.alias) < 0) {
-+            virReportOOMError();
-+            return NULL;
-+        }
-+    } else {
-+        if (!(ret = strdup(disk->info.alias))) {
-+            virReportOOMError();
-+            return NULL;
-+        }
-+    }
-+    return ret;
-+}
-+
-+
- /* Names used before -drive supported the id= option */
- static int qemuAssignDeviceDiskAliasFixed(virDomainDiskDefPtr disk)
- {
-diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
-index 574709e..b2820f0 100644
---- a/src/qemu/qemu_conf.h
-+++ b/src/qemu/qemu_conf.h
-@@ -220,6 +220,9 @@ char * qemuBuildNicStr(virDomainNetDefPtr net,
- char * qemuBuildNicDevStr(virDomainNetDefPtr net,
-                           int vlan);
- 
-+char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk,
-+                               unsigned long long qemudCmdFlags);
-+
- /* Both legacy & current support */
- char *qemuBuildDriveStr(virDomainDiskDefPtr disk,
-                         int bootable,
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 0189dcf..7d2f3ef 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -6552,11 +6552,13 @@ cleanup:
- 
- static int qemudDomainChangeEjectableMedia(struct qemud_driver *driver,
-                                            virDomainObjPtr vm,
--                                           virDomainDiskDefPtr disk)
-+                                           virDomainDiskDefPtr disk,
-+                                           unsigned long long qemuCmdFlags)
- {
-     virDomainDiskDefPtr origdisk = NULL;
-     int i;
-     int ret;
-+    char *driveAlias = NULL;
- 
-     origdisk = NULL;
-     for (i = 0 ; i < vm->def->ndisks ; i++) {
-@@ -6594,6 +6596,9 @@ static int qemudDomainChangeEjectableMedia(struct qemud_driver *driver,
-         driver->securityDriver->domainSetSecurityImageLabel(vm, disk) < 0)
-         return -1;
- 
-+    if (!(driveAlias = qemuDeviceDriveHostAlias(origdisk, qemuCmdFlags)))
-+        goto error;
-+
-     qemuDomainObjPrivatePtr priv = vm->privateData;
-     qemuDomainObjEnterMonitorWithDriver(driver, vm);
-     if (disk->src) {
-@@ -6605,10 +6610,10 @@ static int qemudDomainChangeEjectableMedia(struct qemud_driver *driver,
-                 format = origdisk->driverType;
-         }
-         ret = qemuMonitorChangeMedia(priv->mon,
--                                     origdisk->info.alias,
-+                                     driveAlias,
-                                      disk->src, format);
-     } else {
--        ret = qemuMonitorEjectMedia(priv->mon, origdisk->info.alias);
-+        ret = qemuMonitorEjectMedia(priv->mon, driveAlias);
-     }
-     qemuDomainObjExitMonitorWithDriver(driver, vm);
- 
-@@ -6625,11 +6630,14 @@ static int qemudDomainChangeEjectableMedia(struct qemud_driver *driver,
-     disk->src = NULL;
-     origdisk->type = disk->type;
- 
-+    VIR_FREE(driveAlias);
-+
-     virDomainDiskDefFree(disk);
- 
-     return ret;
- 
- error:
-+    VIR_FREE(driveAlias);
-     if (driver->securityDriver &&
-         driver->securityDriver->domainRestoreSecurityImageLabel &&
-         driver->securityDriver->domainRestoreSecurityImageLabel(vm, disk) < 0)
-@@ -7434,7 +7442,9 @@ static int qemudDomainAttachDevice(virDomainPtr dom,
-         switch (dev->data.disk->device) {
-         case VIR_DOMAIN_DISK_DEVICE_CDROM:
-         case VIR_DOMAIN_DISK_DEVICE_FLOPPY:
--            ret = qemudDomainChangeEjectableMedia(driver, vm, dev->data.disk);
-+            ret = qemudDomainChangeEjectableMedia(driver, vm,
-+                                                  dev->data.disk,
-+                                                  qemuCmdFlags);
-             if (ret == 0)
-                 dev->data.disk = NULL;
-             break;

libvirt-0.7.7-fix-slow-dsync.patch

@@ -1,41 +0,0 @@
-From e3c36a2575bc88a16d776693dc39ea01c780b406 Mon Sep 17 00:00:00 2001
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Tue, 16 Mar 2010 16:03:59 +0100
-Subject: [PATCH] Use fsync() at the end of file allocation instead of O_DSYNC
-
-Instead of opening storage file with O_DSYNC, make sure data are written
-to a disk only before we claim allocation has finished.
----
- src/storage/storage_backend.c |    9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
-index ec9fc43..7294a00 100644
---- a/src/storage/storage_backend.c
-+++ b/src/storage/storage_backend.c
-@@ -331,6 +331,13 @@ static int createRawFileOpHook(int fd, void *data) {
-                 goto cleanup;
-             }
-         }
-+
-+        if (fsync(fd) < 0) {
-+            ret = errno;
-+            virReportSystemError(errno, _("cannot sync data to file '%s'"),
-+                                 hdata->vol->target.path);
-+            goto cleanup;
-+        }
-     }
- 
- cleanup:
-@@ -359,7 +366,7 @@ virStorageBackendCreateRaw(virConnectPtr conn ATTRIBUTE_UNUSED,
-     gid_t gid = (vol->target.perms.gid == -1) ? getgid() : vol->target.perms.gid;
- 
-     if ((createstat = virFileOperation(vol->target.path,
--                                       O_RDWR | O_CREAT | O_EXCL | O_DSYNC,
-+                                       O_RDWR | O_CREAT | O_EXCL,
-                                        vol->target.perms.mode, uid, gid,
-                                        createRawFileOpHook, &hdata,
-                                        VIR_FILE_OP_FORCE_PERMS |
--- 
-1.6.6.1
-

libvirt-0.7.7-fix-usb-parsing.patch

@@ -1,12 +0,0 @@
-diff -rup libvirt-0.7.1/src/util/hostusb.c new/src/hostusb.c
---- libvirt-0.7.1/src/util/hostusb.c	2010-06-03 13:51:14.392459000 -0400
-+++ new/src/util/hostusb.c	2010-06-03 14:49:11.763379000 -0400
-@@ -123,7 +123,7 @@ static int usbFindBusByVendor(virConnect
-             char *tmpstr = de->d_name;
-             unsigned found_bus, found_addr;
- 
--            if (STREQ(de->d_name, "usb"))
-+            if (STRPREFIX(de->d_name, "usb"))
-                 tmpstr += 3;
- 
-             if (virStrToLong_ui(tmpstr, &ignore, 10, &found_bus) < 0) {

libvirt-0.7.7-fix-usb-product.patch

@@ -1,233 +0,0 @@
-From 3a441522017aa9c1b8b54d2ce4569d0f0d96fa72 Mon Sep 17 00:00:00 2001
-From: Cole Robinson <crobinso@redhat.com>
-Date: Fri, 12 Mar 2010 12:36:56 -0500
-Subject: [PATCH] qemu: Add some debugging at domain startup
-
----
- src/qemu/qemu_driver.c |   24 +++++++++++++++++++++++-
- 1 files changed, 23 insertions(+), 1 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index f8ab545..040d645 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -2695,6 +2695,8 @@ static int qemudStartVMDaemon(virConnectPtr conn,
- 
-     FD_ZERO(&keepfd);
- 
-+    DEBUG0("Beginning VM startup process");
-+
-     if (virDomainObjIsActive(vm)) {
-         qemuReportError(VIR_ERR_OPERATION_INVALID,
-                         "%s", _("VM is already active"));
-@@ -2703,22 +2705,27 @@ static int qemudStartVMDaemon(virConnectPtr conn,
- 
-     /* If you are using a SecurityDriver with dynamic labelling,
-        then generate a security label for isolation */
-+    DEBUG0("Generating domain security label (if required)");
-     if (driver->securityDriver &&
-         driver->securityDriver->domainGenSecurityLabel &&
-         driver->securityDriver->domainGenSecurityLabel(vm) < 0)
-         return -1;
- 
-+    DEBUG0("Generating setting domain security labels (if required)");
-     if (driver->securityDriver &&
-         driver->securityDriver->domainSetSecurityAllLabel &&
-         driver->securityDriver->domainSetSecurityAllLabel(vm) < 0)
-         goto cleanup;
- 
--    /* Ensure no historical cgroup for this VM is lieing around bogus settings */
-+    /* Ensure no historical cgroup for this VM is lying around bogus
-+     * settings */
-+    DEBUG0("Ensuring no historical cgroup is lying around");
-     qemuRemoveCgroup(driver, vm, 1);
- 
-     if ((vm->def->ngraphics == 1) &&
-         vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
-         vm->def->graphics[0]->data.vnc.autoport) {
-+        DEBUG0("Determining VNC port");
-         int port = qemudNextFreeVNCPort(driver);
-         if (port < 0) {
-             qemuReportError(VIR_ERR_INTERNAL_ERROR,
-@@ -2735,6 +2742,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-         goto cleanup;
-     }
- 
-+    DEBUG0("Creating domain log file");
-     if ((logfile = qemudLogFD(driver, vm->def->name)) < 0)
-         goto cleanup;
- 
-@@ -2751,14 +2759,17 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-         goto cleanup;
-     }
- 
-+    DEBUG0("Determing emulator version");
-     if (qemudExtractVersionInfo(emulator,
-                                 NULL,
-                                 &qemuCmdFlags) < 0)
-         goto cleanup;
- 
-+    DEBUG0("Setting up domain cgroup (if required)");
-     if (qemuSetupCgroup(driver, vm) < 0)
-         goto cleanup;
- 
-+    DEBUG0("Preparing host devices");
-     if (qemuPrepareHostDevices(driver, vm->def) < 0)
-         goto cleanup;
- 
-@@ -2767,6 +2778,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-         goto cleanup;
-     }
- 
-+    DEBUG0("Preparing monitor state");
-     if (qemuPrepareMonitorChr(driver, priv->monConfig, vm->def->name) < 0)
-         goto cleanup;
- 
-@@ -2798,6 +2810,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-      * use in hotplug
-      */
-     if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) {
-+        DEBUG0("Assigning domain PCI addresses");
-         /* Populate cache with current addresses */
-         if (priv->pciaddrs) {
-             qemuDomainPCIAddressSetFree(priv->pciaddrs);
-@@ -2816,6 +2829,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-         priv->persistentAddrs = 0;
-     }
- 
-+    DEBUG0("Building emulator command line");
-     vm->def->id = driver->nextvmid++;
-     if (qemudBuildCommandLine(conn, driver, vm->def, priv->monConfig,
-                               priv->monJSON, qemuCmdFlags, &argv, &progenv,
-@@ -2899,25 +2913,31 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-     if (ret == -1) /* The VM failed to start */
-         goto cleanup;
- 
-+    DEBUG0("Waiting for monitor to show up");
-     if (qemudWaitForMonitor(driver, vm, pos) < 0)
-         goto abort;
- 
-+    DEBUG0("Detecting VCPU PIDs");
-     if (qemuDetectVcpuPIDs(driver, vm) < 0)
-         goto abort;
- 
-+    DEBUG0("Setting CPU affinity");
-     if (qemudInitCpuAffinity(vm) < 0)
-         goto abort;
- 
-+    DEBUG0("Setting any required VM passwords");
-     if (qemuInitPasswords(conn, driver, vm, qemuCmdFlags) < 0)
-         goto abort;
- 
-     /* If we have -device, then addresses are assigned explicitly.
-      * If not, then we have to detect dynamic ones here */
-     if (!(qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) {
-+        DEBUG0("Determining domain device PCI addresses");
-         if (qemuInitPCIAddresses(driver, vm) < 0)
-             goto abort;
-     }
- 
-+    DEBUG0("Setting initial memory amount");
-     qemuDomainObjEnterMonitorWithDriver(driver, vm);
-     if (qemuMonitorSetBalloon(priv->mon, vm->def->memory) < 0) {
-         qemuDomainObjExitMonitorWithDriver(driver, vm);
-@@ -2925,6 +2945,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-     }
- 
-     if (migrateFrom == NULL) {
-+        DEBUG0("Starting domain CPUs");
-         /* Allow the CPUS to start executing */
-         if (qemuMonitorStartCPUs(priv->mon, conn) < 0) {
-             if (virGetLastError() == NULL)
-@@ -2937,6 +2958,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-     qemuDomainObjExitMonitorWithDriver(driver, vm);
- 
- 
-+    DEBUG0("Writing domain status to disk");
-     if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0)
-         goto abort;
- 
--- 
-1.6.6.1
-
-From 6d5c8a8f51db8ce97ab35ab6022dd5c94ab016b4 Mon Sep 17 00:00:00 2001
-From: Cole Robinson <crobinso@redhat.com>
-Date: Fri, 12 Mar 2010 12:37:52 -0500
-Subject: [PATCH] qemu: Fix USB by product with security enabled
-
-We need to call PrepareHostdevs to determine the USB device path before
-any security calls. PrepareHostUSBDevices was also incorrectly skipping
-all USB devices.
----
- src/qemu/qemu_driver.c |   11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 040d645..b17d26d 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -2360,7 +2360,7 @@ qemuPrepareHostUSBDevices(struct qemud_driver *driver ATTRIBUTE_UNUSED,
- 
-         if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
-             continue;
--        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
-+        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB)
-             continue;
- 
-         /* Resolve a vendor/product to bus/device */
-@@ -2703,6 +2703,11 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-         return -1;
-     }
- 
-+    /* Must be run before security labelling */
-+    DEBUG0("Preparing host devices");
-+    if (qemuPrepareHostDevices(driver, vm->def) < 0)
-+        goto cleanup;
-+
-     /* If you are using a SecurityDriver with dynamic labelling,
-        then generate a security label for isolation */
-     DEBUG0("Generating domain security label (if required)");
-@@ -2769,10 +2774,6 @@ static int qemudStartVMDaemon(virConnectPtr conn,
-     if (qemuSetupCgroup(driver, vm) < 0)
-         goto cleanup;
- 
--    DEBUG0("Preparing host devices");
--    if (qemuPrepareHostDevices(driver, vm->def) < 0)
--        goto cleanup;
--
-     if (VIR_ALLOC(priv->monConfig) < 0) {
-         virReportOOMError();
-         goto cleanup;
--- 
-1.6.6.1
-
-From 65e97240e6e4606820dd1c42ac172319e0af4d8d Mon Sep 17 00:00:00 2001
-From: Cole Robinson <crobinso@redhat.com>
-Date: Mon, 22 Mar 2010 10:45:36 -0400
-Subject: [PATCH] security: selinux: Fix crash when releasing non-existent label
-
-This can be triggered by the qemuStartVMDaemon cleanup path if a
-VM references a non-existent USB device (by product) in the XML.
-
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
----
- src/security/security_selinux.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
-index 975b315..6680e2d 100644
---- a/src/security/security_selinux.c
-+++ b/src/security/security_selinux.c
-@@ -632,7 +632,8 @@ SELinuxReleaseSecurityLabel(virDomainObjPtr vm)
- {
-     const virSecurityLabelDefPtr secdef = &vm->def->seclabel;
- 
--    if (secdef->type == VIR_DOMAIN_SECLABEL_STATIC)
-+    if (secdef->type == VIR_DOMAIN_SECLABEL_STATIC ||
-+        secdef->label == NULL)
-         return 0;
- 
-     context_t con = context_new(secdef->label);
--- 
-1.6.6.1
-

libvirt-0.7.7-init-fixes.patch

@@ -1,35 +0,0 @@
-commit 9d0adf249827dde9e1c0d1c19513cf6018ceb34e
-Author: Cole Robinson <crobinso@redhat.com>
-Date:   Wed May 19 15:57:56 2010 -0400
-
-    daemon: A few initscript corrections
-    
-    Fedora bug https://bugzilla.redhat.com/show_bug.cgi?id=565238
-    
-    - Avahi service is called 'avahi-daemon'
-    - chkconfig descriptions must use \ for line continuations
-
-diff --git a/daemon/libvirtd.init.in b/daemon/libvirtd.init.in
-index d4dc98b..809433e 100644
---- a/daemon/libvirtd.init.in
-+++ b/daemon/libvirtd.init.in
-@@ -9,7 +9,7 @@
- # Should-Start: $named
- # Should-Start: xend
- # Should-Start: hal
--# Should-Start: avahi
-+# Should-Start: avahi-daemon
- # Required-Stop: $network messagebus
- # Should-Stop: $named
- # Default-Start: 3 4 5
-@@ -24,8 +24,8 @@
- # libvirtd:   guest and virtual network management daemon
- #
- # chkconfig: 345 97 03
--# description:  This is a daemon for managing guest instances
--#               and libvirt virtual networks
-+# description:  This is a daemon for managing guest instances \
-+#               and libvirt virtual networks \
- #               See http://libvirt.org
- #
- # processname: libvirtd

libvirt-0.7.7-man-page-list.patch

@@ -1,65 +0,0 @@
-commit e5f31f461f63bbad211e84b810d6ba43a705f9dd
-Author: Justin Clift <justin@salasaga.org>
-Date:   Sun May 30 13:28:42 2010 +1000
-
-    Trivial virsh.pod additions --all for "list" command and similar
-    
-    This is just a trivial patch to virsh.pod (from git master). It adds the
-    following pieces to the virsh man page:
-    
-      + Shows the --inactive and --all optional parameters for the list
-        command.
-    
-        Closes Bugzilla #575512, reported by Renich Bon Ciric
-        https://bugzilla.redhat.com/show_bug.cgi?id=575512
-    
-      + Corrects the existing description of the list command, to now say
-        that only running domains are listed if no domains are specified.
-    
-        The man page up until this point has said all domains are listed if
-        no domains are specified, which is incorrect.
-    
-      + Adds the "shut off" state to the list of states for the list
-        command.
-    
-      + Adds a missing =back around line 755, that pod2man was complaining
-        was missing.
-
-diff --git a/tools/virsh.pod b/tools/virsh.pod
-index cf7585d..495bb46 100644
---- a/tools/virsh.pod
-+++ b/tools/virsh.pod
-@@ -156,10 +156,10 @@ description see:
-   L<http://libvirt.org/formatcaps.html>
- The XML also show the NUMA topology information if available.
- 
--=item B<list>
-+=item B<list> optional I<--inactive> I<--all>
- 
- Prints information about one or more domains.  If no domains are
--specified it prints out information about all domains.
-+specified it prints out information about running domains.
- 
- An example format for the list is as follows:
- 
-@@ -177,7 +177,7 @@ State is the run state (see below).
- 
- B<STATES>
- 
--The State field lists 6 states for a domain, and which ones the
-+The State field lists 7 states for a domain, and which ones the
- current domain is in.
- 
- =over 4
-@@ -205,6 +205,11 @@ The domain is in the process of shutting down, i.e. the guest operating system
- has been notified and should be in the process of stopping its operations
- gracefully.
- 
-+=item B<shut off>
-+
-+The domain is not running.  Usually this indicates the domain has been
-+shut down completely, or has not been started.
-+
- =item B<crashed>
- 
- The domain has crashed, which is always a violent ending.  Usually

libvirt-0.7.7-network-collision.patch

@@ -1,169 +0,0 @@
-commit a83fe2c23efad190a1e00e448f607fe032650fd6
-Author: Cole Robinson <crobinso@redhat.com>
-Date:   Thu May 20 19:31:16 2010 -0400
-
-    network: bridge: Don't start network if it collides with host routing
-    
-    Fedora bug https://bugzilla.redhat.com/show_bug.cgi?id=235961
-    
-    If using the default virtual network, an easy way to lose guest network
-    connectivity is to install libvirt inside the VM. The autostarted
-    default network inside the guest collides with host virtual network
-    routing. This is a long standing issue that has caused users quite a
-    bit of pain and confusion.
-    
-    On network startup, parse /proc/net/route and compare the requested
-    IP+netmask against host routing destinations: if any matches are found,
-    refuse to start the network.
-    
-    v2: Drop sscanf, fix a comment typo, comment that function could use
-        libnl instead of /proc
-    
-    v3: Consider route netmask. Compare binary data rather than convert to
-        string.
-    
-    v4: Return to using sscanf, drop inet functions in favor of virSocket,
-        parsing safety checks. Don't make parse failures fatal, in case
-        expected format changes.
-    
-    v5: Try and continue if we receive unexpected. Delimit parsed lines to
-        prevent scanning past newline
-
-diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
-index 5d7ef19..7ab3f3e 100644
---- a/src/network/bridge_driver.c
-+++ b/src/network/bridge_driver.c
-@@ -57,6 +57,7 @@
- #include "iptables.h"
- #include "bridge.h"
- #include "logging.h"
-+#include "util/network.h"
- 
- #define NETWORK_PID_DIR LOCAL_STATE_DIR "/run/libvirt/network"
- #define NETWORK_STATE_DIR LOCAL_STATE_DIR "/lib/libvirt/network"
-@@ -908,6 +909,114 @@ cleanup:
-     return ret;
- }
- 
-+#define PROC_NET_ROUTE "/proc/net/route"
-+
-+/* XXX: This function can be a lot more exhaustive, there are certainly
-+ *      other scenarios where we can ruin host network connectivity.
-+ * XXX: Using a proper library is preferred over parsing /proc
-+ */
-+static int networkCheckRouteCollision(virNetworkObjPtr network)
-+{
-+    int ret = -1, len;
-+    unsigned int net_dest;
-+    char *cur, *buf = NULL;
-+    enum {MAX_ROUTE_SIZE = 1024*64};
-+    virSocketAddr inaddress, innetmask;
-+
-+    if (!network->def->ipAddress || !network->def->netmask)
-+        return 0;
-+
-+    if (virSocketParseAddr(network->def->ipAddress, &inaddress, 0) < 0) {
-+        networkReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("cannot parse IP address '%s'"),
-+                           network->def->ipAddress);
-+        goto error;
-+    }
-+
-+    if (virSocketParseAddr(network->def->netmask, &innetmask, 0) < 0) {
-+        networkReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("cannot parse netmask '%s'"),
-+                           network->def->netmask);
-+        goto error;
-+    }
-+
-+    if (inaddress.stor.ss_family != AF_INET ||
-+        innetmask.stor.ss_family != AF_INET) {
-+        /* Only support collision check for IPv4 */
-+        goto out;
-+    }
-+
-+    net_dest = (inaddress.inet4.sin_addr.s_addr &
-+                innetmask.inet4.sin_addr.s_addr);
-+
-+    /* Read whole routing table into memory */
-+    if ((len = virFileReadAll(PROC_NET_ROUTE, MAX_ROUTE_SIZE, &buf)) < 0)
-+        goto error;
-+
-+    /* Dropping the last character shouldn't hurt */
-+    if (len > 0)
-+        buf[len-1] = '\0';
-+
-+    VIR_DEBUG("%s output:\n%s", PROC_NET_ROUTE, buf);
-+
-+    if (!STRPREFIX (buf, "Iface"))
-+        goto out;
-+
-+    /* First line is just headings, skip it */
-+    cur = strchr(buf, '\n');
-+    if (cur)
-+        cur++;
-+
-+    while (cur) {
-+        char iface[17], dest[128], mask[128];
-+        unsigned int addr_val, mask_val;
-+        int num;
-+
-+        /* NUL-terminate the line, so sscanf doesn't go beyond a newline.  */
-+        char *nl = strchr(cur, '\n');
-+        if (nl) {
-+            *nl++ = '\0';
-+        }
-+
-+        num = sscanf(cur, "%16s %127s %*s %*s %*s %*s %*s %127s",
-+                     iface, dest, mask);
-+        cur = nl;
-+
-+        if (num != 3) {
-+            VIR_DEBUG("Failed to parse %s", PROC_NET_ROUTE);
-+            continue;
-+        }
-+
-+        if (virStrToLong_ui(dest, NULL, 16, &addr_val) < 0) {
-+            VIR_DEBUG("Failed to convert network address %s to uint", dest);
-+            continue;
-+        }
-+
-+        if (virStrToLong_ui(mask, NULL, 16, &mask_val) < 0) {
-+            VIR_DEBUG("Failed to convert network mask %s to uint", mask);
-+            continue;
-+        }
-+
-+        addr_val &= mask_val;
-+
-+        if ((net_dest == addr_val) &&
-+            (innetmask.inet4.sin_addr.s_addr == mask_val)) {
-+            networkReportError(VIR_ERR_INTERNAL_ERROR,
-+                              _("Network %s/%s is already in use by "
-+                                "interface %s"),
-+                                network->def->ipAddress,
-+                                network->def->netmask, iface);
-+            goto error;
-+        }
-+    }
-+
-+out:
-+    ret = 0;
-+error:
-+    VIR_FREE(buf);
-+    return ret;
-+}
-+
- static int networkStartNetworkDaemon(struct network_driver *driver,
-                                      virNetworkObjPtr network)
- {
-@@ -919,6 +1028,10 @@ static int networkStartNetworkDaemon(struct network_driver *driver,
-         return -1;
-     }
- 
-+    /* Check to see if network collides with an existing route */
-+    if (networkCheckRouteCollision(network) < 0)
-+        return -1;
-+
-     if ((err = brAddBridge(driver->brctl, network->def->bridge))) {
-         virReportSystemError(err,
-                              _("cannot create bridge '%s'"),

libvirt-0.7.7-no-secdriver-crash.patch

@@ -1,26 +0,0 @@
-commit b7a7b3365145f6e9e434a3265a58666cd2e6d8dd
-Author: Guido Günther <agx@sigxcpu.org>
-Date:   Wed Mar 17 21:04:11 2010 +0100
-
-    Don't crash without a security driver
-    
-    "virsh dominfo <vm>" crashes if there's no primary security driver set
-    since we only intialize the secmodel.model and secmodel.doi if we have
-    one. Attached patch checks for securityPrimaryDriver instead of
-    securityDriver since the later is always set in qemudSecurityInit().
-    
-    Closes: http://bugs.debian.org/574359
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 1f2b11d..257f914 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -4979,7 +4979,7 @@ static int qemudNodeGetSecurityModel(virConnectPtr conn,
-     int ret = 0;
- 
-     qemuDriverLock(driver);
--    if (!driver->securityDriver) {
-+    if (!driver->securityPrimaryDriver) {
-         memset(secmodel, 0, sizeof (*secmodel));
-         goto cleanup;
-     }

libvirt-0.7.7-nodedev-conversions.patch

@@ -1,77 +0,0 @@
-commit 74c7a3463d18a530d6d749d0199061b5d3f17faa
-Author: Cole Robinson <crobinso@redhat.com>
-Date:   Tue May 11 14:44:34 2010 -0400
-
-    node_device: udev: Fix PCI product/vendor swappage
-    
-    Product and vendor values were swapped in the XML, which made virt-manager
-    PCI device listing kinda useless.
-
-diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
-index bcfe991..4a9d65f 100644
---- a/src/node_device/node_device_udev.c
-+++ b/src/node_device/node_device_udev.c
-@@ -382,8 +382,8 @@ static int udevTranslatePCIIds(unsigned int vendor,
- 
-     /* pci_get_strings returns void */
-     pci_get_strings(&m,
--                    &vendor_name,
-                     &device_name,
-+                    &vendor_name,
-                     NULL,
-                     NULL);
- 
-commit 75d88455f54088f88bc7a503da0a4cd413ef7b95
-Author: Klaus Ethgen <Klaus@Ethgen.de>
-Date:   Tue Apr 27 09:20:47 2010 +0200
-
-    The base used for conversion of USB values should be 16 not 10.
-    
-    Signed-off-by: Guido Günther <agx@sigxcpu.org>
-
-diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
-index b12a49e..3a5a7e2 100644
---- a/src/node_device/node_device_udev.c
-+++ b/src/node_device/node_device_udev.c
-@@ -548,8 +548,6 @@ out:
- }
- 
- 
--/* XXX Is 10 the correct base for the Number/Class/SubClass/Protocol
-- * conversions?  */
- static int udevProcessUSBInterface(struct udev_device *device,
-                                    virNodeDeviceDefPtr def)
- {
-@@ -559,28 +557,28 @@ static int udevProcessUSBInterface(struct udev_device *device,
-     if (udevGetUintSysfsAttr(device,
-                              "bInterfaceNumber",
-                              &data->usb_if.number,
--                             10) == PROPERTY_ERROR) {
-+                             16) == PROPERTY_ERROR) {
-         goto out;
-     }
- 
-     if (udevGetUintSysfsAttr(device,
-                              "bInterfaceClass",
-                              &data->usb_if._class,
--                             10) == PROPERTY_ERROR) {
-+                             16) == PROPERTY_ERROR) {
-         goto out;
-     }
- 
-     if (udevGetUintSysfsAttr(device,
-                              "bInterfaceSubClass",
-                              &data->usb_if.subclass,
--                             10) == PROPERTY_ERROR) {
-+                             16) == PROPERTY_ERROR) {
-         goto out;
-     }
- 
-     if (udevGetUintSysfsAttr(device,
-                              "bInterfaceProtocol",
-                              &data->usb_if.protocol,
--                             10) == PROPERTY_ERROR) {
-+                             16) == PROPERTY_ERROR) {
-         goto out;
-     }
- 

libvirt-0.7.7-pci-decimal-parsing.patch

@@ -1,50 +0,0 @@
-commit e984019688509605966c03cd77f4591d2cc222d3
-Author: Cole Robinson <crobinso@redhat.com>
-Date:   Fri Apr 30 18:14:35 2010 +0200
-
-    domain: Fix PCI address decimal parsing regression
-    
-    <hostdev> address parsing previously attempted to detect the number
-    base: currently it is hardcoded to base 16, which can break PCI
-    assignment via virt-manager. Revert to the previous behavior.
-    
-    * src/conf/domain_conf.c: virDomainDevicePCIAddressParseXML, switch to
-      virStrToLong_ui(bus, NULL, 0, ...) to autodetect base
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 1607e8b..546ddf2 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -1079,28 +1079,28 @@ virDomainDevicePCIAddressParseXML(xmlNodePtr node,
-     function = virXMLPropString(node, "function");
- 
-     if (domain &&
--        virStrToLong_ui(domain, NULL, 16, &addr->domain) < 0) {
-+        virStrToLong_ui(domain, NULL, 0, &addr->domain) < 0) {
-         virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                              _("Cannot parse <address> 'domain' attribute"));
-         goto cleanup;
-     }
- 
-     if (bus &&
--        virStrToLong_ui(bus, NULL, 16, &addr->bus) < 0) {
-+        virStrToLong_ui(bus, NULL, 0, &addr->bus) < 0) {
-         virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                              _("Cannot parse <address> 'bus' attribute"));
-         goto cleanup;
-     }
- 
-     if (slot &&
--        virStrToLong_ui(slot, NULL, 16, &addr->slot) < 0) {
-+        virStrToLong_ui(slot, NULL, 0, &addr->slot) < 0) {
-         virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                              _("Cannot parse <address> 'slot' attribute"));
-         goto cleanup;
-     }
- 
-     if (function &&
--        virStrToLong_ui(function, NULL, 16, &addr->function) < 0) {
-+        virStrToLong_ui(function, NULL, 0, &addr->function) < 0) {
-         virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                              _("Cannot parse <address> 'function' attribute"));
-         goto cleanup;

libvirt-0.7.7-qemu-startup-output.patch

@@ -1,108 +0,0 @@
-commit 83be64034a0b530c904ceb4fd1ed1c10b5cdf4bf
-Author: Cole Robinson <crobinso@redhat.com>
-Date:   Mon May 17 10:15:53 2010 -0400
-
-    qemu: Report cmdline output if VM dies early
-    
-    qemuReadLogOutput early VM death detection is racy and won't always work.
-    Startup then errors when connecting to the VM monitor. This won't report
-    the emulator cmdline output which is typically the most useful diagnostic.
-    
-    Check if the VM has died at the very end of the monitor connection step,
-    and if so, report the cmdline output.
-    
-    See also: https://bugzilla.redhat.com/show_bug.cgi?id=581381
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index ab6bec8..582fdee 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -2034,39 +2034,47 @@ static void qemudFreePtyPath(void *payload, const char *name ATTRIBUTE_UNUSED)
-     VIR_FREE(payload);
- }
- 
-+static void
-+qemuReadLogFD(int logfd, char *buf, int maxlen, int off)
-+{
-+    int ret;
-+    char *tmpbuf = buf + off;
-+
-+    ret = saferead(logfd, tmpbuf, maxlen - off - 1);
-+    if (ret < 0) {
-+        ret = 0;
-+    }
-+
-+    tmpbuf[ret] = '\0';
-+}
-+
- static int
- qemudWaitForMonitor(struct qemud_driver* driver,
-                     virDomainObjPtr vm, off_t pos)
- {
--    char buf[4096]; /* Plenty of space to get startup greeting */
-+    char buf[4096] = ""; /* Plenty of space to get startup greeting */
-     int logfd;
-     int ret = -1;
-+    virHashTablePtr paths = NULL;
- 
--    if ((logfd = qemudLogReadFD(driver->logDir, vm->def->name, pos))
--        < 0)
-+    if ((logfd = qemudLogReadFD(driver->logDir, vm->def->name, pos)) < 0)
-         return -1;
- 
--    ret = qemudReadLogOutput(vm, logfd, buf, sizeof(buf),
--                             qemudFindCharDevicePTYs,
--                             "console", 30);
--    if (close(logfd) < 0) {
--        char ebuf[4096];
--        VIR_WARN(_("Unable to close logfile: %s"),
--                 virStrerror(errno, ebuf, sizeof ebuf));
--    }
--
--    if (ret < 0)
--        return -1;
-+    if (qemudReadLogOutput(vm, logfd, buf, sizeof(buf),
-+                           qemudFindCharDevicePTYs,
-+                           "console", 30) < 0)
-+        goto closelog;
- 
-     VIR_DEBUG("Connect monitor to %p '%s'", vm, vm->def->name);
--    if (qemuConnectMonitor(driver, vm) < 0)
--        return -1;
-+    if (qemuConnectMonitor(driver, vm) < 0) {
-+        goto cleanup;
-+    }
- 
-     /* Try to get the pty path mappings again via the monitor. This is much more
-      * reliable if it's available.
-      * Note that the monitor itself can be on a pty, so we still need to try the
-      * log output method. */
--    virHashTablePtr paths = virHashCreate(0);
-+    paths = virHashCreate(0);
-     if (paths == NULL) {
-         virReportOOMError();
-         goto cleanup;
-@@ -2087,6 +2095,23 @@ cleanup:
-         virHashFree(paths, qemudFreePtyPath);
-     }
- 
-+    if (kill(vm->pid, 0) == -1 && errno == ESRCH) {
-+        /* VM is dead, any other error raised in the interim is probably
-+         * not as important as the qemu cmdline output */
-+        qemuReadLogFD(logfd, buf, sizeof(buf), strlen(buf));
-+        qemuReportError(VIR_ERR_INTERNAL_ERROR,
-+                        _("process exited while connecting to monitor: %s"),
-+                        buf);
-+        ret = -1;
-+    }
-+
-+closelog:
-+    if (close(logfd) < 0) {
-+        char ebuf[4096];
-+        VIR_WARN(_("Unable to close logfile: %s"),
-+                 virStrerror(errno, ebuf, sizeof ebuf));
-+    }
-+
-     return ret;
- }
- 

libvirt-0.7.7-sanitize-pool.patch

@@ -1,155 +0,0 @@
-diff -rup libvirt-0.7.7/src/conf/storage_conf.c new/src/conf/storage_conf.c
---- libvirt-0.7.7/src/conf/storage_conf.c	2010-03-05 09:46:29.000000000 -0500
-+++ new/src/conf/storage_conf.c	2010-06-17 12:28:44.319588000 -0400
-@@ -601,6 +601,7 @@ virStoragePoolDefParseXML(xmlXPathContex
-     xmlNodePtr source_node;
-     char *type = NULL;
-     char *uuid = NULL;
-+    char *tmppath;
- 
-     if (VIR_ALLOC(ret) < 0) {
-         virReportOOMError();
-@@ -698,11 +699,16 @@ virStoragePoolDefParseXML(xmlXPathContex
-         }
-     }
- 
--    if ((ret->target.path = virXPathString("string(./target/path)", ctxt)) == NULL) {
-+    if ((tmppath = virXPathString("string(./target/path)", ctxt)) == NULL) {
-         virStorageReportError(VIR_ERR_XML_ERROR,
-                               "%s", _("missing storage pool target path"));
-         goto cleanup;
-     }
-+    ret->target.path = virFileSanitizePath(tmppath);
-+    VIR_FREE(tmppath);
-+    if (!ret->target.path)
-+        goto cleanup;
-+
- 
-     if (virStorageDefParsePerms(ctxt, &ret->target.perms,
-                                 "./target/permissions", 0700) < 0)
-diff -rup libvirt-0.7.7/src/libvirt_private.syms new/src/libvirt_private.syms
---- libvirt-0.7.7/src/libvirt_private.syms	2010-03-05 10:45:23.000000000 -0500
-+++ new/src/libvirt_private.syms	2010-06-17 12:28:44.334585000 -0400
-@@ -582,6 +582,7 @@ virFileReadLimFD;
- virFilePid;
- virFileReadPid;
- virFileLinkPointsTo;
-+virFileSanitizePath;
- virParseNumber;
- virAsprintf;
- virRun;
-diff -rup libvirt-0.7.7/src/storage/storage_driver.c new/src/storage/storage_driver.c
---- libvirt-0.7.7/src/storage/storage_driver.c	2010-03-05 09:46:29.000000000 -0500
-+++ new/src/storage/storage_driver.c	2010-06-17 12:28:44.346586000 -0400
-@@ -1200,6 +1200,11 @@ storageVolumeLookupByPath(virConnectPtr 
-     virStorageDriverStatePtr driver = conn->storagePrivateData;
-     unsigned int i;
-     virStorageVolPtr ret = NULL;
-+    char *cleanpath;
-+
-+    cleanpath = virFileSanitizePath(path);
-+    if (!cleanpath)
-+        return NULL;
- 
-     storageDriverLock(driver);
-     for (i = 0 ; i < driver->pools.count && !ret ; i++) {
-@@ -1209,7 +1214,7 @@ storageVolumeLookupByPath(virConnectPtr 
-             const char *stable_path;
- 
-             stable_path = virStorageBackendStablePath(driver->pools.objs[i],
--                                                      path);
-+                                                      cleanpath);
-             /*
-              * virStorageBackendStablePath already does
-              * virStorageReportError if it fails; we just need to keep
-@@ -1238,6 +1243,7 @@ storageVolumeLookupByPath(virConnectPtr 
-                               "%s", _("no storage vol with matching path"));
- 
- cleanup:
-+    VIR_FREE(cleanpath);
-     storageDriverUnlock(driver);
-     return ret;
- }
-diff -rup libvirt-0.7.7/src/util/util.c new/src/util/util.c
---- libvirt-0.7.7/src/util/util.c	2010-03-03 05:48:25.000000000 -0500
-+++ new/src/util/util.c	2010-06-17 12:28:44.357588000 -0400
-@@ -1867,6 +1867,55 @@ int virFileAbsPath(const char *path, cha
-     return 0;
- }
- 
-+/* Remove spurious / characters from a path. The result must be freed */
-+char *
-+virFileSanitizePath(const char *path)
-+{
-+    const char *cur = path;
-+    char *cleanpath;
-+    int idx = 0;
-+
-+    cleanpath = strdup(path);
-+    if (!cleanpath) {
-+        virReportOOMError();
-+        return NULL;
-+    }
-+
-+    /* Need to sanitize:
-+     * //           -> //
-+     * ///          -> /
-+     * /../foo      -> /../foo
-+     * /foo///bar/  -> /foo/bar
-+     */
-+
-+    /* Starting with // is valid posix, but ///foo == /foo */
-+    if (cur[0] == '/' && cur[1] == '/' && cur[2] != '/') {
-+        idx = 2;
-+        cur += 2;
-+    }
-+
-+    /* Sanitize path in place */
-+    while (*cur != '\0') {
-+        if (*cur != '/') {
-+            cleanpath[idx++] = *cur++;
-+            continue;
-+        }
-+
-+        /* Skip all extra / */
-+        while (*++cur == '/')
-+            continue;
-+
-+        /* Don't add a trailing / */
-+        if (idx != 0 && *cur == '\0')
-+            break;
-+
-+        cleanpath[idx++] = '/';
-+    }
-+    cleanpath[idx] = '\0';
-+
-+    return cleanpath;
-+}
-+
- /* Like strtol, but produce an "int" result, and check more carefully.
-    Return 0 upon success;  return -1 to indicate failure.
-    When END_PTR is NULL, the byte after the final valid digit must be NUL.
-diff -rup libvirt-0.7.7/src/util/util.h new/src/util/util.h
---- libvirt-0.7.7/src/util/util.h	2010-02-19 12:14:07.000000000 -0500
-+++ new/src/util/util.h	2010-06-17 12:28:44.364585000 -0400
-@@ -109,6 +109,8 @@ char *virFindFileInPath(const char *file
- 
- int virFileExists(const char *path);
- 
-+char *virFileSanitizePath(const char *path);
-+
- enum {
-     VIR_FILE_OP_NONE        = 0,
-     VIR_FILE_OP_AS_UID      = (1 << 0),
-diff -rup libvirt-0.7.7/tests/storagepoolxml2xmlin/pool-dir.xml new/tests/storagepoolxml2xmlin/pool-dir.xml
---- libvirt-0.7.7/tests/storagepoolxml2xmlin/pool-dir.xml	2009-12-22 04:37:57.000000000 -0500
-+++ new/tests/storagepoolxml2xmlin/pool-dir.xml	2010-06-17 12:28:44.367585000 -0400
-@@ -7,7 +7,7 @@
-   <source>
-   </source>
-   <target>
--    <path>/var/lib/libvirt/images</path>
-+    <path>///var/////lib/libvirt/images//</path>
-     <permissions>
-       <mode>0700</mode>
-       <owner>0</owner>

libvirt-0.7.7-set-kernel-perms.patch

@@ -1,87 +0,0 @@
-From 3f1aa08af6580c215d973bc6bf57f505dbf8b926 Mon Sep 17 00:00:00 2001
-From: Cole Robinson <crobinso@redhat.com>
-Date: Fri, 12 Mar 2010 13:38:39 -0500
-Subject: [PATCH] security: Set permissions for kernel/initrd
-
-Fixes URL installs when running virt-install as root on Fedora.
----
- src/qemu/qemu_security_dac.c    |   21 +++++++++++++++++++++
- src/security/security_selinux.c |   16 ++++++++++++++++
- 2 files changed, 37 insertions(+), 0 deletions(-)
-
-diff --git a/src/qemu/qemu_security_dac.c b/src/qemu/qemu_security_dac.c
-index 6911f48..1883fbe 100644
---- a/src/qemu/qemu_security_dac.c
-+++ b/src/qemu/qemu_security_dac.c
-@@ -332,6 +332,15 @@ qemuSecurityDACRestoreSecurityAllLabel(virDomainObjPtr vm)
-                                                      vm->def->disks[i]) < 0)
-             rc = -1;
-     }
-+
-+    if (vm->def->os.kernel &&
-+        qemuSecurityDACRestoreSecurityFileLabel(vm->def->os.kernel) < 0)
-+        rc = -1;
-+
-+    if (vm->def->os.initrd &&
-+        qemuSecurityDACRestoreSecurityFileLabel(vm->def->os.initrd) < 0)
-+        rc = -1;
-+
-     return rc;
- }
- 
-@@ -356,6 +365,18 @@ qemuSecurityDACSetSecurityAllLabel(virDomainObjPtr vm)
-             return -1;
-     }
- 
-+    if (vm->def->os.kernel &&
-+        qemuSecurityDACSetOwnership(vm->def->os.kernel,
-+                                    driver->user,
-+                                    driver->group) < 0)
-+        return -1;
-+
-+    if (vm->def->os.initrd &&
-+        qemuSecurityDACSetOwnership(vm->def->os.initrd,
-+                                    driver->user,
-+                                    driver->group) < 0)
-+        return -1;
-+
-     return 0;
- }
- 
-diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
-index b2c8581..975b315 100644
---- a/src/security/security_selinux.c
-+++ b/src/security/security_selinux.c
-@@ -616,6 +616,14 @@ SELinuxRestoreSecurityAllLabel(virDomainObjPtr vm)
-             rc = -1;
-     }
- 
-+    if (vm->def->os.kernel &&
-+        SELinuxRestoreSecurityFileLabel(vm->def->os.kernel) < 0)
-+        rc = -1;
-+
-+    if (vm->def->os.initrd &&
-+        SELinuxRestoreSecurityFileLabel(vm->def->os.initrd) < 0)
-+        rc = -1;
-+
-     return rc;
- }
- 
-@@ -736,6 +744,14 @@ SELinuxSetSecurityAllLabel(virDomainObjPtr vm)
-             return -1;
-     }
- 
-+    if (vm->def->os.kernel &&
-+        SELinuxSetFilecon(vm->def->os.kernel, default_content_context) < 0)
-+        return -1;
-+
-+    if (vm->def->os.initrd &&
-+        SELinuxSetFilecon(vm->def->os.initrd, default_content_context) < 0)
-+        return -1;
-+
-     return 0;
- }
- 
--- 
-1.6.6.1
-

libvirt-0.7.7-udev-wireless.patch

@@ -1,66 +0,0 @@
-commit 07f6c3a95f1caca368c8723b5b0a25ae2faa1ffe
-Author: David Allan <dallan@redhat.com>
-Date:   Thu May 27 10:44:02 2010 -0400
-
-    v2 of Cole's wlan support
-    
-    * Incorporated Jim's feedback (v1 & v2)
-    
-    * Moved case of DEVTYPE == "wlan" up as it's definitive that we have a network interface.
-    
-    * Made comment more detailed about the wired case to explain better
-      how it differentiates between wired network interfaces and USB
-      devices.
-
-diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
-index f0485f1..c437861 100644
---- a/src/node_device/node_device_udev.c
-+++ b/src/node_device/node_device_udev.c
-@@ -597,8 +597,15 @@ static int udevProcessNetworkInterface(struct udev_device *device,
-                                        virNodeDeviceDefPtr def)
- {
-     int ret = -1;
-+    const char *devtype = udev_device_get_devtype(device);
-     union _virNodeDevCapData *data = &def->caps->data;
- 
-+    if (devtype && STREQ(devtype, "wlan")) {
-+        data->net.subtype = VIR_NODE_DEV_CAP_NET_80211;
-+    } else {
-+        data->net.subtype = VIR_NODE_DEV_CAP_NET_80203;
-+    }
-+
-     if (udevGetStringProperty(device,
-                               "INTERFACE",
-                               &data->net.ifname) == PROPERTY_ERROR) {
-@@ -1074,6 +1081,8 @@ static int udevGetDeviceType(struct udev_device *device,
-     int ret = 0;
- 
-     devtype = udev_device_get_devtype(device);
-+    VIR_DEBUG("Found device type '%s' for device '%s'",
-+              NULLSTR(devtype), udev_device_get_sysname(device));
- 
-     if (devtype != NULL && STREQ(devtype, "usb_device")) {
-         *type = VIR_NODE_DEV_CAP_USB_DEV;
-@@ -1105,13 +1114,20 @@ static int udevGetDeviceType(struct udev_device *device,
-         goto out;
-     }
- 
-+    if (devtype != NULL && STREQ(devtype, "wlan")) {
-+        *type = VIR_NODE_DEV_CAP_NET;
-+        goto out;
-+    }
-+
-     if (udevGetUintProperty(device, "PCI_CLASS", &tmp, 16) == PROPERTY_FOUND) {
-         *type = VIR_NODE_DEV_CAP_PCI_DEV;
-         goto out;
-     }
- 
--    /* It does not appear that network interfaces set the device type
--     * property. */
-+    /* It does not appear that wired network interfaces set the
-+     * DEVTYPE property.  USB devices also have an INTERFACE property,
-+     * but they do set DEVTYPE, so if devtype is NULL and the
-+     * INTERFACE property exists, we have a network device. */
-     if (devtype == NULL &&
-         udevGetStringProperty(device,
-                               "INTERFACE",

sources

@@ -1 +1 @@
-5f315b0bf20e3964f7657ba1e630cd67  libvirt-0.7.7.tar.gz
+SHA512 (libvirt-4.1.0.tar.xz) = 62d1a228adf3270cc6defe3cbf92dac8c4ce2c434c4d97219571ccef799a4f6304cfd1ba9938338356641285f53ac71145d7b398523021c5ea1dc8e3d49cf894