libvirt-5.1.0-9.fc30

CVE-2019-10161: arbitrary file read/exec via virDomainSaveImageGetXMLDesc API (bz #1722463, bz #1720115) CVE-2019-10166: virDomainManagedSaveDefineXML API exposed to readonly clients (bz #1722462, bz #1720114) CVE-2019-10167: arbitrary command execution via virConnectGetDomainCapabilities API (bz #1722464, bz #1720117) CVE-2019-10168: arbitrary command execution via virConnectBaselineHypervisorCPU and virConnectCompareHypervisorCPU APIs (bz #1722466, bz #1720118) CVE-2019-3886: virsh domhostname command discloses guest hostname in readonly mode [fedora-rawhide Cannot start VM with a CBR 2.0 TPM device (bz #1712556) libvirtd does not update VM .xml configurations after virsh snapshot/blockcommit (bz #1722348)
Change the %post fix to match upstream
2019-06-20 12:40:47 -04:00 · 2019-05-31 08:54:40 -07:00 · 2019-05-31 08:13:41 -07:00 · 2019-05-29 12:05:17 -07:00 · 2019-05-29 11:58:54 -07:00 · 2019-05-21 17:06:01 +01:00
52 changed files with 2891 additions and 3494 deletions
@@ -0,0 +1,145 @@
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Mon, 18 Mar 2019 10:58:48 +0000
+Subject: [PATCH] storage: split off code for calling rbd_list
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The rbd_list method has a quite unpleasant signature returning an
+array of strings in a single buffer instead of an array. It is
+being deprecated in favour of rbd_list2. To maintain clarity of
+code when supporting both APIs in parallel, split the rbd_list
+code out into a separate method.
+
+In splitting this we now honour the rbd_list failures.
+
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 28c8403ed07896d6d7e06d7726ed904027206719)
+---
+ src/storage/storage_backend_rbd.c | 83 +++++++++++++++++++++----------
+ 1 file changed, 58 insertions(+), 25 deletions(-)
+
+diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
+index 2b7af1db23..0865163756 100644
+--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
+@@ -565,19 +565,68 @@ volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol,
+     return ret;
+ }
+ 
+
+static char **
+virStorageBackendRBDGetVolNames(virStorageBackendRBDStatePtr ptr)
+{
+    char **names = NULL;
+    size_t nnames = 0;
+    int rc;
+    size_t max_size = 1024;
+    VIR_AUTOFREE(char *) namebuf = NULL;
+    const char *name;
+
+    while (true) {
+        if (VIR_ALLOC_N(namebuf, max_size) < 0)
+            goto error;
+
+        rc = rbd_list(ptr->ioctx, namebuf, &max_size);
+        if (rc >= 0)
+            break;
+        if (rc != -ERANGE) {
+            virReportSystemError(-rc, "%s", _("Unable to list RBD images"));
+            goto error;
+        }
+        VIR_FREE(namebuf);
+    }
+
+    for (name = namebuf; name < namebuf + max_size;) {
+        VIR_AUTOFREE(char *) namedup = NULL;
+
+        if (STREQ(name, ""))
+            break;
+
+        if (VIR_STRDUP(namedup, name) < 0)
+            goto error;
+
+        if (VIR_APPEND_ELEMENT(names, nnames, namedup) < 0)
+            goto error;
+
+        name += strlen(name) + 1;
+    }
+
+    if (VIR_EXPAND_N(names, nnames, 1) < 0)
+        goto error;
+
+    return names;
+
+ error:
+    virStringListFreeCount(names, nnames);
+    return NULL;
+}
+
+
+ static int
+ virStorageBackendRBDRefreshPool(virStoragePoolObjPtr pool)
+ {
+-    size_t max_size = 1024;
+     int ret = -1;
+-    int len = -1;
+     int r = 0;
+-    char *name;
+     virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool);
+     virStorageBackendRBDStatePtr ptr = NULL;
+     struct rados_cluster_stat_t clusterstat;
+     struct rados_pool_stat_t poolstat;
+-    VIR_AUTOFREE(char *) names = NULL;
+    char **names = NULL;
+    size_t i;
+ 
+     if (!(ptr = virStorageBackendRBDNewState(pool)))
+         goto cleanup;
+@@ -602,33 +651,16 @@ virStorageBackendRBDRefreshPool(virStoragePoolObjPtr pool)
+               def->source.name, clusterstat.kb, clusterstat.kb_avail,
+               poolstat.num_bytes);
+ 
+-    while (true) {
+-        if (VIR_ALLOC_N(names, max_size) < 0)
+-            goto cleanup;
+-
+-        len = rbd_list(ptr->ioctx, names, &max_size);
+-        if (len >= 0)
+-            break;
+-        if (len != -ERANGE) {
+-            VIR_WARN("%s", "A problem occurred while listing RBD images");
+-            goto cleanup;
+-        }
+-        VIR_FREE(names);
+-    }
+    if (!(names = virStorageBackendRBDGetVolNames(ptr)))
+        goto cleanup;
+ 
+-    for (name = names; name < names + max_size;) {
+    for (i = 0; names[i] != NULL; i++) {
+         VIR_AUTOPTR(virStorageVolDef) vol = NULL;
+ 
+-        if (STREQ(name, ""))
+-            break;
+-
+         if (VIR_ALLOC(vol) < 0)
+             goto cleanup;
+ 
+-        if (VIR_STRDUP(vol->name, name) < 0)
+-            goto cleanup;
+-
+-        name += strlen(name) + 1;
+        VIR_STEAL_PTR(vol->name, names[i]);
+ 
+         r = volStorageBackendRBDRefreshVolInfo(vol, pool, ptr);
+ 
+@@ -661,6 +693,7 @@ virStorageBackendRBDRefreshPool(virStoragePoolObjPtr pool)
+     ret = 0;
+ 
+  cleanup:
+    virStringListFree(names);
+     virStorageBackendRBDFreeState(&ptr);
+     return ret;
+ }
@@ -1,122 +0,0 @@
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Fri, 12 May 2017 14:05:55 +0200
-Subject: [PATCH] tests: Check default GIC version for aarch64/virt TCG guests
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-(cherry picked from commit b24eaf6210ebaf5dc8d29621063873c8419c517e)
---
- .../qemuxml2argv-aarch64-gic-none-tcg.args         | 19 ++++++++++++++++
- .../qemuxml2argv-aarch64-gic-none-tcg.xml          | 17 +++++++++++++++
- tests/qemuxml2argvtest.c                           |  3 +++
- .../qemuxml2xmlout-aarch64-gic-none-tcg.xml        | 25 ++++++++++++++++++++++
- tests/qemuxml2xmltest.c                            |  1 +
- 5 files changed, 65 insertions(+)
- create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.args
- create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.xml
- create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-tcg.xml
-
-diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.args
-new file mode 100644
-index 000000000..975a01481
--- /dev/null
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.args
-@@ -0,0 +1,19 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-aarch64 \
-+-name guest \
-+-S \
-+-machine virt,accel=tcg,gic-version=3 \
-+-cpu cortex-a57 \
-+-m 1024 \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
-+-nographic \
-+-nodefaults \
-+-monitor unix:/tmp/lib/domain--1-guest/monitor.sock,server,nowait \
-+-no-acpi \
-+-boot c
-diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.xml
-new file mode 100644
-index 000000000..0aa33dbec
--- /dev/null
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.xml
-@@ -0,0 +1,17 @@
-+<domain type='qemu'>
-+  <name>guest</name>
-+  <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
-+  <memory unit='KiB'>1048576</memory>
-+  <vcpu placement='static'>1</vcpu>
-+  <os>
-+    <type arch='aarch64' machine='virt'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <cpu mode='custom'>
-+    <model>cortex-a57</model>
-+  </cpu>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
-+    <memballoon model='none'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index cc4fb91cd..362b140ac 100644
--- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -2250,6 +2250,9 @@ mymain(void)
-     DO_TEST_GIC("aarch64-gic-none-both", GIC_BOTH,
-             QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT,
-             QEMU_CAPS_MACH_VIRT_GIC_VERSION);
-+    DO_TEST_GIC("aarch64-gic-none-tcg", GIC_BOTH,
-+            QEMU_CAPS_MACHINE_OPT,
-+            QEMU_CAPS_MACH_VIRT_GIC_VERSION);
-     DO_TEST_GIC("aarch64-gic-default", GIC_NONE,
-             QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT);
-     DO_TEST_GIC("aarch64-gic-default", GIC_NONE,
-diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-tcg.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-tcg.xml
-new file mode 100644
-index 000000000..69510e281
--- /dev/null
-+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-tcg.xml
-@@ -0,0 +1,25 @@
-+<domain type='qemu'>
-+  <name>guest</name>
-+  <uuid>6ba410c5-1e5c-4d57-bee7-2228e7ffa32f</uuid>
-+  <memory unit='KiB'>1048576</memory>
-+  <currentMemory unit='KiB'>1048576</currentMemory>
-+  <vcpu placement='static'>1</vcpu>
-+  <os>
-+    <type arch='aarch64' machine='virt'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <features>
-+    <gic version='3'/>
-+  </features>
-+  <cpu mode='custom' match='exact' check='none'>
-+    <model fallback='allow'>cortex-a57</model>
-+  </cpu>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
-+    <memballoon model='none'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index eae999dd6..aae632afe 100644
--- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -1073,6 +1073,7 @@ mymain(void)
-     DO_TEST_FULL("aarch64-gic-none-v2", WHEN_BOTH, GIC_V2, NONE);
-     DO_TEST_FULL("aarch64-gic-none-v3", WHEN_BOTH, GIC_V3, NONE);
-     DO_TEST_FULL("aarch64-gic-none-both", WHEN_BOTH, GIC_BOTH, NONE);
-+    DO_TEST_FULL("aarch64-gic-none-tcg", WHEN_BOTH, GIC_BOTH, NONE);
-     DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_NONE, NONE);
-     DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_V2, NONE);
-     DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_V3, NONE);
@@ -1,85 +0,0 @@
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Fri, 12 May 2017 13:29:57 +0200
-Subject: [PATCH] qemu: Use GICv2 for aarch64/virt TCG guests
-
-There are currently some limitations in the emulated GICv3
-that make it unsuitable as a default. Use GICv2 instead.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1450433
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-(cherry picked from commit bc07101a7c2cd2ce07ad1ca28c47e0a7cde5625d)
---
- src/qemu/qemu_domain.c                             | 23 +++++++++++++++++++++-
- .../qemuxml2argv-aarch64-gic-none-tcg.args         |  2 +-
- .../qemuxml2xmlout-aarch64-gic-none-tcg.xml        |  2 +-
- 3 files changed, 24 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 589eb1889..891f8258a 100644
--- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -2527,6 +2527,24 @@ qemuDomainDefEnableDefaultFeatures(virDomainDefPtr def,
-         for (version = VIR_GIC_VERSION_LAST - 1;
-              version > VIR_GIC_VERSION_NONE;
-              version--) {
-+
-+            /* We want to use the highest available GIC version for guests;
-+             * however, the emulated GICv3 is currently lacking a MSI controller,
-+             * making it unsuitable for the pure PCIe topology we aim for.
-+             *
-+             * For that reason, we skip this step entirely for TCG guests,
-+             * and rely on the code below to pick the default version, GICv2,
-+             * which supports all the features we need.
-+             *
-+             * We'll want to revisit this once MSI support for GICv3 has been
-+             * implemented in QEMU.
-+             *
-+             * See https://bugzilla.redhat.com/show_bug.cgi?id=1414081 */
-+            if (version == VIR_GIC_VERSION_3 &&
-+                def->virtType == VIR_DOMAIN_VIRT_QEMU) {
-+                continue;
-+            }
-+
-             if (virQEMUCapsSupportsGICVersion(qemuCaps,
-                                               def->virtType,
-                                               version)) {
-@@ -2544,8 +2562,11 @@ qemuDomainDefEnableDefaultFeatures(virDomainDefPtr def,
- 
-     /* Use the default GIC version if no version was specified */
-     if (def->features[VIR_DOMAIN_FEATURE_GIC] == VIR_TRISTATE_SWITCH_ON &&
-        def->gic_version == VIR_GIC_VERSION_NONE)
-+        def->gic_version == VIR_GIC_VERSION_NONE) {
-+        VIR_DEBUG("Using GIC version %s (default)",
-+                  virGICVersionTypeToString(VIR_GIC_VERSION_DEFAULT));
-         def->gic_version = VIR_GIC_VERSION_DEFAULT;
-+    }
- }
- 
- 
-diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.args
-index 975a01481..52b699696 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.args
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.args
-@@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name guest \
- -S \
--machine virt,accel=tcg,gic-version=3 \
-+-machine virt,accel=tcg \
- -cpu cortex-a57 \
- -m 1024 \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-tcg.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-tcg.xml
-index 69510e281..a0cd0b768 100644
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-tcg.xml
-+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-tcg.xml
-@@ -9,7 +9,7 @@
-     <boot dev='hd'/>
-   </os>
-   <features>
-    <gic version='3'/>
-+    <gic version='2'/>
-   </features>
-   <cpu mode='custom' match='exact' check='none'>
-     <model fallback='allow'>cortex-a57</model>
@@ -0,0 +1,92 @@
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Mon, 18 Mar 2019 11:11:38 +0000
+Subject: [PATCH] storage: add support for new rbd_list2 method
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The rbd_list method has been deprecated in Ceph >= 14.0.0
+in favour of the new rbd_list2 method which populates an
+array of structs.
+
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 3aa190f2a43a632b542a6ba751a6c3ab4d51f1dd)
+---
+ m4/virt-storage-rbd.m4            |  1 +
+ src/storage/storage_backend_rbd.c | 43 +++++++++++++++++++++++++++++++
+ 2 files changed, 44 insertions(+)
+
+diff --git a/m4/virt-storage-rbd.m4 b/m4/virt-storage-rbd.m4
+index 17e2115309..f3d9d04908 100644
+--- a/m4/virt-storage-rbd.m4
+++ b/m4/virt-storage-rbd.m4
+@@ -33,6 +33,7 @@ AC_DEFUN([LIBVIRT_STORAGE_CHECK_RBD], [
+       old_LIBS="$LIBS"
+       LIBS="$LIBS $LIBRBD_LIBS"
+       AC_CHECK_FUNCS([rbd_get_features],[],[LIBRBD_FOUND=no])
+      AC_CHECK_FUNCS([rbd_list2])
+       LIBS="$old_LIBS"
+     fi
+ 
+diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
+index 0865163756..bfc3419f9c 100644
+--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
+@@ -566,6 +566,48 @@ volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol,
+ }
+ 
+ 
+#ifdef HAVE_RBD_LIST2
+static char **
+virStorageBackendRBDGetVolNames(virStorageBackendRBDStatePtr ptr)
+{
+    char **names = NULL;
+    size_t nnames = 0;
+    int rc;
+    rbd_image_spec_t *images = NULL;
+    size_t nimages = 16;
+    size_t i;
+
+    while (true) {
+        if (VIR_ALLOC_N(images, nimages) < 0)
+            goto error;
+
+        rc = rbd_list2(ptr->ioctx, images, &nimages);
+        if (rc >= 0)
+            break;
+        if (rc != -ERANGE) {
+            virReportSystemError(-rc, "%s", _("Unable to list RBD images"));
+            goto error;
+        }
+    }
+
+    if (VIR_ALLOC_N(names, nimages + 1) < 0)
+        goto error;
+    nnames = nimages;
+
+    for (i = 0; i < nimages; i++)
+        VIR_STEAL_PTR(names[i], images->name);
+
+    return names;
+
+ error:
+    virStringListFreeCount(names, nnames);
+    rbd_image_spec_list_cleanup(images, nimages);
+    VIR_FREE(images);
+    return NULL;
+}
+
+#else /* ! HAVE_RBD_LIST2 */
+
+ static char **
+ virStorageBackendRBDGetVolNames(virStorageBackendRBDStatePtr ptr)
+ {
+@@ -614,6 +656,7 @@ virStorageBackendRBDGetVolNames(virStorageBackendRBDStatePtr ptr)
+     virStringListFreeCount(names, nnames);
+     return NULL;
+ }
+#endif /* ! HAVE_RBD_LIST2 */
+ 
+ 
+ static int
@@ -1,67 +0,0 @@
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Fri, 12 May 2017 14:38:08 +0200
-Subject: [PATCH] gic: Remove VIR_GIC_VERSION_DEFAULT
-
-The QEMU default is GICv2, and some of the code in libvirt
-relies on the exact value. Stop pretending that's not the
-case and use GICv2 explicitly where needed.
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-(cherry picked from commit 5645badd1fe04fee7237c2f95e7710e978e40770)
---
- src/qemu/qemu_command.c | 6 +++---
- src/qemu/qemu_domain.c  | 7 +++----
- src/util/virgic.h       | 3 ---
- 3 files changed, 6 insertions(+), 10 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 2d1328cf9..5feddc523 100644
--- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -7321,9 +7321,9 @@ qemuBuildMachineCommandLine(virCommandPtr cmd,
-                     goto cleanup;
-                 }
- 
-                /* The default GIC version should not be specified on the
-                 * QEMU commandline for backwards compatibility reasons */
-                if (def->gic_version != VIR_GIC_VERSION_DEFAULT) {
-+                /* The default GIC version (GICv2) should not be specified on
-+                 * the QEMU commandline for backwards compatibility reasons */
-+                if (def->gic_version != VIR_GIC_VERSION_2) {
-                     if (!virQEMUCapsGet(qemuCaps,
-                                         QEMU_CAPS_MACH_VIRT_GIC_VERSION)) {
-                         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 891f8258a..4a127cedf 100644
--- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -2560,12 +2560,11 @@ qemuDomainDefEnableDefaultFeatures(virDomainDefPtr def,
-         def->features[VIR_DOMAIN_FEATURE_GIC] = VIR_TRISTATE_SWITCH_ON;
-     }
- 
-    /* Use the default GIC version if no version was specified */
-+    /* Use the default GIC version (GICv2) if no version was specified */
-     if (def->features[VIR_DOMAIN_FEATURE_GIC] == VIR_TRISTATE_SWITCH_ON &&
-         def->gic_version == VIR_GIC_VERSION_NONE) {
-        VIR_DEBUG("Using GIC version %s (default)",
-                  virGICVersionTypeToString(VIR_GIC_VERSION_DEFAULT));
-        def->gic_version = VIR_GIC_VERSION_DEFAULT;
-+        VIR_DEBUG("Using GIC version 2 (default)");
-+        def->gic_version = VIR_GIC_VERSION_2;
-     }
- }
- 
-diff --git a/src/util/virgic.h b/src/util/virgic.h
-index 1c9efd60f..2d77fdd45 100644
--- a/src/util/virgic.h
-+++ b/src/util/virgic.h
-@@ -35,9 +35,6 @@ typedef enum {
- 
- VIR_ENUM_DECL(virGICVersion);
- 
-/* Consider GIC v2 the default */
-# define VIR_GIC_VERSION_DEFAULT VIR_GIC_VERSION_2
-
- typedef enum {
-     VIR_GIC_IMPLEMENTATION_NONE = 0,
-     VIR_GIC_IMPLEMENTATION_KERNEL = (1 << 1),
@@ -0,0 +1,133 @@
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Mon, 18 Mar 2019 17:31:21 +0000
+Subject: [PATCH] network: improve error report when firewall chain creation
+ fails
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+During startup we create some top level chains in which all
+virtual network firewall rules will be placed. The upfront
+creation is done to avoid slowing down creation of individual
+virtual networks by checking for chain existance every time.
+
+There are some factors which can cause this upfront creation
+to fail and while a message will get into the libvirtd log
+this won't be seen by users who later try to start a virtual
+network. Instead they'll just get a message saying that the
+libvirt top level chain does not exist. This message is
+accurate, but unhelpful for solving the root cause.
+
+This patch thus saves any error during daemon startup and
+reports it when trying to create a virtual network later.
+
+Reviewed-by: Andrea Bolognani <abologna@redhat.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 9f4e35dc73ec9e940aa61bc7c140c2b800218ef3)
+---
+ src/network/bridge_driver.c          |  3 +--
+ src/network/bridge_driver_linux.c    | 31 +++++++++++++++++++++-------
+ src/network/bridge_driver_nop.c      |  3 +--
+ src/network/bridge_driver_platform.h |  2 +-
+ 4 files changed, 27 insertions(+), 12 deletions(-)
+
+diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
+index b3ca5b8a15..1da60f0a21 100644
+--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
+@@ -2108,8 +2108,7 @@ static void
+ networkReloadFirewallRules(virNetworkDriverStatePtr driver, bool startup)
+ {
+     VIR_INFO("Reloading iptables rules");
+-    if (networkPreReloadFirewallRules(startup) < 0)
+-        return;
+    networkPreReloadFirewallRules(startup);
+     virNetworkObjListForEach(driver->networks,
+                              networkReloadFirewallRulesHelper,
+                              NULL);
+diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_linux.c
+index b10d0a6c4d..c899f4b6d0 100644
+--- a/src/network/bridge_driver_linux.c
+++ b/src/network/bridge_driver_linux.c
+@@ -35,11 +35,25 @@ VIR_LOG_INIT("network.bridge_driver_linux");
+ 
+ #define PROC_NET_ROUTE "/proc/net/route"
+ 
+-int networkPreReloadFirewallRules(bool startup)
+static virErrorPtr errInit;
+
+void networkPreReloadFirewallRules(bool startup)
+ {
+-    int ret = iptablesSetupPrivateChains();
+-    if (ret < 0)
+-        return -1;
+    int rc;
+
+    /* We create global rules upfront as we don't want
+     * the perf hit of conditionally figuring out whether
+     * to create them each time a network is started.
+     *
+     * Any errors here are saved to be reported at time
+     * of starting the network though as that makes them
+     * more likely to be seen by a human
+     */
+    rc = iptablesSetupPrivateChains();
+    if (rc < 0) {
+        errInit = virSaveLastError();
+        virResetLastError();
+    }
+ 
+     /*
+      * If this is initial startup, and we just created the
+@@ -54,10 +68,8 @@ int networkPreReloadFirewallRules(bool startup)
+      * rules will be present. Thus we can safely just tell it
+      * to always delete from the builin chain
+      */
+-    if (startup && ret == 1)
+    if (startup && rc == 1)
+         iptablesSetDeletePrivate(false);
+-
+-    return 0;
+ }
+ 
+ 
+@@ -671,6 +683,11 @@ int networkAddFirewallRules(virNetworkDefPtr def)
+     virFirewallPtr fw = NULL;
+     int ret = -1;
+ 
+    if (errInit) {
+        virSetError(errInit);
+        return -1;
+    }
+
+     if (def->bridgeZone) {
+ 
+         /* if a firewalld zone has been specified, fail/log an error
+diff --git a/src/network/bridge_driver_nop.c b/src/network/bridge_driver_nop.c
+index a0e57012f9..ea9db338cb 100644
+--- a/src/network/bridge_driver_nop.c
+++ b/src/network/bridge_driver_nop.c
+@@ -19,9 +19,8 @@
+ 
+ #include <config.h>
+ 
+-int networkPreReloadFirewallRules(bool startup ATTRIBUTE_UNUSED)
+void networkPreReloadFirewallRules(bool startup ATTRIBUTE_UNUSED)
+ {
+-    return 0;
+ }
+ 
+ 
+diff --git a/src/network/bridge_driver_platform.h b/src/network/bridge_driver_platform.h
+index baeb22bc3e..95fd64bdc7 100644
+--- a/src/network/bridge_driver_platform.h
+++ b/src/network/bridge_driver_platform.h
+@@ -58,7 +58,7 @@ struct _virNetworkDriverState {
+ typedef struct _virNetworkDriverState virNetworkDriverState;
+ typedef virNetworkDriverState *virNetworkDriverStatePtr;
+ 
+-int networkPreReloadFirewallRules(bool startup);
+void networkPreReloadFirewallRules(bool startup);
+ void networkPostReloadFirewallRules(bool startup);
+ 
+ int networkCheckRouteCollision(virNetworkDefPtr def);
@@ -1,198 +0,0 @@
-From: Laine Stump <laine@laine.org>
-Date: Thu, 18 May 2017 14:16:27 -0400
-Subject: [PATCH] Revert "qemu: propagate bridge MTU into qemu "host_mtu"
- option"
-
-This reverts commit 2841e675.
-
-It turns out that adding the host_mtu field to the PCI capabilities in
-the guest bumps the length of PCI capabilities beyond the 32 byte
-boundary, so the virtio-net device gets 64 bytes of ioport space
-instead of 32, which offsets the address of all the other following
-devices. Migration doesn't work very well when the location and length
-of PCI capabilities of devices is changed between source and
-destination.
-
-This means that we need to make sure that the absence/presence of
-host_mtu on the qemu commandline always matches between source and
-destination, which means that we need to make setting of host_mtu an
-opt-in thing (it can't happen automatically when the bridge being used
-has a non-default MTU, which is what commit 2841e675 implemented).
-
-I do want to re-implement this feature with an <mtu auto='on'/>
-setting, but probably won't backport that to any stable branches, so
-I'm first reverting the original commit, and that revert can be pushed
-to the few releases that have been made since the original (3.1.0 -
-3.3.0)
-
-Resolves: https://bugzilla.redhat.com/1449346
-(cherry picked from commit 77780a29edace958a1f931d3281b962be4f5290e)
-(cherry picked from commit a2f5e87dceb1725c16cd4df17a4b7381ecf65901)
---
- src/qemu/qemu_command.c   | 32 ++++++++++----------------------
- src/qemu/qemu_command.h   |  3 +--
- src/qemu/qemu_hotplug.c   |  5 ++---
- src/qemu/qemu_interface.c |  5 ++---
- src/qemu/qemu_interface.h |  3 +--
- 5 files changed, 16 insertions(+), 32 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 5feddc523..3abfe7b55 100644
--- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -3629,8 +3629,7 @@ qemuBuildNicDevStr(virDomainDefPtr def,
-                    int vlan,
-                    unsigned int bootindex,
-                    size_t vhostfdSize,
-                   virQEMUCapsPtr qemuCaps,
-                   unsigned int mtu)
-+                   virQEMUCapsPtr qemuCaps)
- {
-     virBuffer buf = VIR_BUFFER_INITIALIZER;
-     const char *nic = net->model;
-@@ -3754,23 +3753,13 @@ qemuBuildNicDevStr(virDomainDefPtr def,
-         virBufferAsprintf(&buf, ",rx_queue_size=%u", net->driver.virtio.rx_queue_size);
-     }
- 
-    if (usingVirtio && mtu) {
-        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_HOST_MTU)) {
-
-            virBufferAsprintf(&buf, ",host_mtu=%u", mtu);
-
-        } else {
-            /* log an error if mtu was requested specifically for this
-             * interface, otherwise, if it's just what was reported by
-             * the attached network, ignore it.
-             */
-            if (net->mtu) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                               _("setting MTU is not supported with "
-                                 "this QEMU binary"));
-                goto error;
-            }
-+    if (usingVirtio && net->mtu) {
-+        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_HOST_MTU)) {
-+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                           _("setting MTU is not supported with this QEMU binary"));
-+            goto error;
-         }
-+        virBufferAsprintf(&buf, ",host_mtu=%u", net->mtu);
-     }
- 
-     if (vlan == -1)
-@@ -8213,7 +8202,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver,
-     VIR_FREE(netdev);
- 
-     if (!(nic = qemuBuildNicDevStr(def, net, -1, bootindex,
-                                   queues, qemuCaps, net->mtu))) {
-+                                   queues, qemuCaps))) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        "%s", _("Error generating NIC -device string"));
-         goto error;
-@@ -8259,7 +8248,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
-     virDomainNetType actualType = virDomainNetGetActualType(net);
-     virNetDevBandwidthPtr actualBandwidth;
-     size_t i;
-    unsigned int mtu = net->mtu;
- 
- 
-     if (!bootindex)
-@@ -8314,7 +8302,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
-         memset(tapfd, -1, tapfdSize * sizeof(tapfd[0]));
- 
-         if (qemuInterfaceBridgeConnect(def, driver, net,
-                                       tapfd, &tapfdSize, &mtu) < 0)
-+                                       tapfd, &tapfdSize) < 0)
-             goto cleanup;
-         break;
- 
-@@ -8494,7 +8482,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
-     }
-     if (qemuDomainSupportsNicdev(def, net)) {
-         if (!(nic = qemuBuildNicDevStr(def, net, vlan, bootindex,
-                                       vhostfdSize, qemuCaps, mtu)))
-+                                       vhostfdSize, qemuCaps)))
-             goto cleanup;
-         virCommandAddArgList(cmd, "-device", nic, NULL);
-     } else {
-diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
-index 7da92c8c9..09cb00ee9 100644
--- a/src/qemu/qemu_command.h
-+++ b/src/qemu/qemu_command.h
-@@ -101,8 +101,7 @@ char *qemuBuildNicDevStr(virDomainDefPtr def,
-                          int vlan,
-                          unsigned int bootindex,
-                          size_t vhostfdSize,
-                         virQEMUCapsPtr qemuCaps,
-                         unsigned int mtu);
-+                         virQEMUCapsPtr qemuCaps);
- 
- char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk);
- 
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index f133d04a8..2a4159560 100644
--- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -968,7 +968,6 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
-     bool charDevPlugged = false;
-     bool netdevPlugged = false;
-     bool hostPlugged = false;
-    unsigned int mtu = net->mtu;
- 
-     /* preallocate new slot for device */
-     if (VIR_REALLOC_N(vm->def->nets, vm->def->nnets + 1) < 0)
-@@ -1025,7 +1024,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
-             goto cleanup;
-         memset(vhostfd, -1, sizeof(*vhostfd) * vhostfdSize);
-         if (qemuInterfaceBridgeConnect(vm->def, driver, net,
-                                       tapfd, &tapfdSize, &mtu) < 0)
-+                                       tapfd, &tapfdSize) < 0)
-             goto cleanup;
-         iface_connected = true;
-         if (qemuInterfaceOpenVhostNet(vm->def, net, priv->qemuCaps,
-@@ -1239,7 +1238,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
-         VIR_FORCE_CLOSE(vhostfd[i]);
- 
-     if (!(nicstr = qemuBuildNicDevStr(vm->def, net, vlan, 0,
-                                      queueSize, priv->qemuCaps, mtu)))
-+                                      queueSize, priv->qemuCaps)))
-         goto try_remove;
- 
-     qemuDomainObjEnterMonitor(driver, vm);
-diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c
-index c5dca60f1..ce448d243 100644
--- a/src/qemu/qemu_interface.c
-+++ b/src/qemu/qemu_interface.c
-@@ -503,8 +503,7 @@ qemuInterfaceBridgeConnect(virDomainDefPtr def,
-                            virQEMUDriverPtr driver,
-                            virDomainNetDefPtr net,
-                            int *tapfd,
-                           size_t *tapfdSize,
-                           unsigned int *mtu)
-+                           size_t *tapfdSize)
- {
-     const char *brname;
-     int ret = -1;
-@@ -545,7 +544,7 @@ qemuInterfaceBridgeConnect(virDomainDefPtr def,
-                                            def->uuid, tunpath, tapfd, *tapfdSize,
-                                            virDomainNetGetActualVirtPortProfile(net),
-                                            virDomainNetGetActualVlan(net),
-                                           net->mtu, mtu,
-+                                           0, NULL,
-                                            tap_create_flags) < 0) {
-             virDomainAuditNetDevice(def, net, tunpath, false);
-             goto cleanup;
-diff --git a/src/qemu/qemu_interface.h b/src/qemu/qemu_interface.h
-index ba74ac2cf..a7faa0b3d 100644
--- a/src/qemu/qemu_interface.h
-+++ b/src/qemu/qemu_interface.h
-@@ -51,8 +51,7 @@ int qemuInterfaceBridgeConnect(virDomainDefPtr def,
-                                virQEMUDriverPtr driver,
-                                virDomainNetDefPtr net,
-                                int *tapfd,
-                               size_t *tapfdSize,
-                               unsigned int *mtu)
-+                               size_t *tapfdSize)
-     ATTRIBUTE_NONNULL(2);
- 
- int qemuInterfaceOpenVhostNet(virDomainDefPtr def,
@@ -0,0 +1,149 @@
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Mon, 18 Mar 2019 16:49:32 +0000
+Subject: [PATCH] network: split setup of ipv4 and ipv6 top level chains
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+During startup libvirtd creates top level chains for both ipv4
+and ipv6 protocols. If this fails for any reason then startup
+of virtual networks is blocked.
+
+The default virtual network, however, only requires use of ipv4
+and some servers have ipv6 disabled so it is expected that ipv6
+chain creation will fail. There could equally be servers with
+no ipv4, only ipv6.
+
+This patch thus makes error reporting a little more fine grained
+so that it works more sensibly when either ipv4 or ipv6 is
+disabled on the server. Only the protocols that are actually
+used by the virtual network have errors reported.
+
+Reviewed-by: Andrea Bolognani <abologna@redhat.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 686803a1a2e1e0641916b1c9e2c7e3910fe598d4)
+---
+ src/network/bridge_driver_linux.c | 34 +++++++++++++++++++++++++------
+ src/util/viriptables.c            | 14 ++++---------
+ src/util/viriptables.h            |  2 +-
+ 3 files changed, 33 insertions(+), 17 deletions(-)
+
+diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_linux.c
+index c899f4b6d0..50fc197134 100644
+--- a/src/network/bridge_driver_linux.c
+++ b/src/network/bridge_driver_linux.c
+@@ -35,10 +35,12 @@ VIR_LOG_INIT("network.bridge_driver_linux");
+ 
+ #define PROC_NET_ROUTE "/proc/net/route"
+ 
+-static virErrorPtr errInit;
+static virErrorPtr errInitV4;
+static virErrorPtr errInitV6;
+ 
+ void networkPreReloadFirewallRules(bool startup)
+ {
+    bool created = false;
+     int rc;
+ 
+     /* We create global rules upfront as we don't want
+@@ -49,11 +51,21 @@ void networkPreReloadFirewallRules(bool startup)
+      * of starting the network though as that makes them
+      * more likely to be seen by a human
+      */
+-    rc = iptablesSetupPrivateChains();
+    rc = iptablesSetupPrivateChains(VIR_FIREWALL_LAYER_IPV4);
+     if (rc < 0) {
+-        errInit = virSaveLastError();
+        errInitV4 = virSaveLastError();
+         virResetLastError();
+     }
+    if (rc)
+        created = true;
+
+    rc = iptablesSetupPrivateChains(VIR_FIREWALL_LAYER_IPV6);
+    if (rc < 0) {
+        errInitV6 = virSaveLastError();
+        virResetLastError();
+    }
+    if (rc)
+        created = true;
+ 
+     /*
+      * If this is initial startup, and we just created the
+@@ -68,7 +80,7 @@ void networkPreReloadFirewallRules(bool startup)
+      * rules will be present. Thus we can safely just tell it
+      * to always delete from the builin chain
+      */
+-    if (startup && rc == 1)
+    if (startup && created)
+         iptablesSetDeletePrivate(false);
+ }
+ 
+@@ -683,8 +695,18 @@ int networkAddFirewallRules(virNetworkDefPtr def)
+     virFirewallPtr fw = NULL;
+     int ret = -1;
+ 
+-    if (errInit) {
+-        virSetError(errInit);
+    if (errInitV4 &&
+        (virNetworkDefGetIPByIndex(def, AF_INET, 0) ||
+         virNetworkDefGetRouteByIndex(def, AF_INET, 0))) {
+        virSetError(errInitV4);
+        return -1;
+    }
+
+    if (errInitV6 &&
+        (virNetworkDefGetIPByIndex(def, AF_INET6, 0) ||
+         virNetworkDefGetRouteByIndex(def, AF_INET6, 0) ||
+         def->ipv6nogw)) {
+        virSetError(errInitV6);
+         return -1;
+     }
+ 
+diff --git a/src/util/viriptables.c b/src/util/viriptables.c
+index d67b640a3b..0e3c0ad73a 100644
+--- a/src/util/viriptables.c
+++ b/src/util/viriptables.c
+@@ -127,7 +127,7 @@ iptablesPrivateChainCreate(virFirewallPtr fw,
+ 
+ 
+ int
+-iptablesSetupPrivateChains(void)
+iptablesSetupPrivateChains(virFirewallLayer layer)
+ {
+     virFirewallPtr fw = NULL;
+     int ret = -1;
+@@ -143,17 +143,11 @@ iptablesSetupPrivateChains(void)
+     };
+     bool changed = false;
+     iptablesGlobalChainData data[] = {
+-        { VIR_FIREWALL_LAYER_IPV4, "filter",
+        { layer, "filter",
+           filter_chains, ARRAY_CARDINALITY(filter_chains), &changed },
+-        { VIR_FIREWALL_LAYER_IPV4, "nat",
+        { layer, "nat",
+           natmangle_chains, ARRAY_CARDINALITY(natmangle_chains), &changed },
+-        { VIR_FIREWALL_LAYER_IPV4, "mangle",
+-          natmangle_chains, ARRAY_CARDINALITY(natmangle_chains), &changed },
+-        { VIR_FIREWALL_LAYER_IPV6, "filter",
+-          filter_chains, ARRAY_CARDINALITY(filter_chains), &changed },
+-        { VIR_FIREWALL_LAYER_IPV6, "nat",
+-          natmangle_chains, ARRAY_CARDINALITY(natmangle_chains), &changed },
+-        { VIR_FIREWALL_LAYER_IPV6, "mangle",
+        { layer, "mangle",
+           natmangle_chains, ARRAY_CARDINALITY(natmangle_chains), &changed },
+     };
+     size_t i;
+diff --git a/src/util/viriptables.h b/src/util/viriptables.h
+index 903f390f89..e680407ec8 100644
+--- a/src/util/viriptables.h
+++ b/src/util/viriptables.h
+@@ -24,7 +24,7 @@
+ # include "virsocketaddr.h"
+ # include "virfirewall.h"
+ 
+-int              iptablesSetupPrivateChains      (void);
+int              iptablesSetupPrivateChains      (virFirewallLayer layer);
+ 
+ void             iptablesSetDeletePrivate        (bool pvt);
+ 
@@ -1,145 +0,0 @@
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 29 Mar 2017 14:45:44 +0200
-Subject: [PATCH] cpu: Introduce virCPUCopyMigratable
-
-This new internal API makes a copy of virCPUDef while removing all
-features which would block migration. It uses cpu_map.xml as a database
-of such features, which should only be used as a fallback when we cannot
-get the data from a hypervisor. The main goal of this API is to decouple
-this filtering from virCPUUpdate so that the hypervisor driver can
-filter the features according to the hypervisor.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 05e91c79f19e0be96526098d58a3498dac3f8529)
---
- src/cpu/cpu.c            | 31 +++++++++++++++++++++++++++++++
- src/cpu/cpu.h            |  8 ++++++++
- src/cpu/cpu_x86.c        | 25 +++++++++++++++++++++++++
- src/libvirt_private.syms |  1 +
- 4 files changed, 65 insertions(+)
-
-diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
-index 93647a2ed..8a407ac18 100644
--- a/src/cpu/cpu.c
-+++ b/src/cpu/cpu.c
-@@ -1130,3 +1130,34 @@ virCPUExpandFeatures(virArch arch,
-     VIR_DEBUG("nfeatures=%zu", cpu->nfeatures);
-     return 0;
- }
-+
-+
-+/**
-+ * virCPUCopyMigratable:
-+ *
-+ * @arch: CPU architecture
-+ * @cpu: CPU definition to be copied
-+ *
-+ * Makes a copy of @cpu with all features which would block migration removed.
-+ * If this doesn't make sense for a given architecture, the function returns a
-+ * plain copy of @cpu (i.e., a copy with no features removed).
-+ *
-+ * Returns the copy of the CPU or NULL on error.
-+ */
-+virCPUDefPtr
-+virCPUCopyMigratable(virArch arch,
-+                     virCPUDefPtr cpu)
-+{
-+    struct cpuArchDriver *driver;
-+
-+    VIR_DEBUG("arch=%s, cpu=%p, model=%s",
-+              virArchToString(arch), cpu, NULLSTR(cpu->model));
-+
-+    if (!(driver = cpuGetSubDriver(arch)))
-+        return NULL;
-+
-+    if (driver->copyMigratable)
-+        return driver->copyMigratable(cpu);
-+    else
-+        return virCPUDefCopy(cpu);
-+}
-diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
-index 8c238ad55..352445c40 100644
--- a/src/cpu/cpu.h
-+++ b/src/cpu/cpu.h
-@@ -118,6 +118,9 @@ typedef int
- typedef int
- (*virCPUArchExpandFeatures)(virCPUDefPtr cpu);
- 
-+typedef virCPUDefPtr
-+(*virCPUArchCopyMigratable)(virCPUDefPtr cpu);
-+
- struct cpuArchDriver {
-     const char *name;
-     const virArch *arch;
-@@ -138,6 +141,7 @@ struct cpuArchDriver {
-     virCPUArchTranslate translate;
-     virCPUArchConvertLegacy convertLegacy;
-     virCPUArchExpandFeatures expandFeatures;
-+    virCPUArchCopyMigratable copyMigratable;
- };
- 
- 
-@@ -254,6 +258,10 @@ int
- virCPUExpandFeatures(virArch arch,
-                      virCPUDefPtr cpu);
- 
-+virCPUDefPtr
-+virCPUCopyMigratable(virArch arch,
-+                     virCPUDefPtr cpu);
-+
- /* virCPUDataFormat and virCPUDataParse are implemented for unit tests only and
-  * have no real-life usage
-  */
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index 48648a7f4..a771b251e 100644
--- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -2903,6 +2903,30 @@ virCPUx86ExpandFeatures(virCPUDefPtr cpu)
- }
- 
- 
-+static virCPUDefPtr
-+virCPUx86CopyMigratable(virCPUDefPtr cpu)
-+{
-+    virCPUDefPtr copy;
-+    virCPUx86MapPtr map;
-+
-+    if (!(map = virCPUx86GetMap()))
-+        return NULL;
-+
-+    if (!(copy = virCPUDefCopyWithoutModel(cpu)))
-+        return NULL;
-+
-+    if (virCPUDefCopyModelFilter(copy, cpu, false,
-+                                 x86FeatureIsMigratable, map) < 0)
-+        goto error;
-+
-+    return copy;
-+
-+ error:
-+    virCPUDefFree(copy);
-+    return NULL;
-+}
-+
-+
- int
- virCPUx86DataAddCPUID(virCPUDataPtr cpuData,
-                       const virCPUx86CPUID *cpuid)
-@@ -2978,4 +3002,5 @@ struct cpuArchDriver cpuDriverX86 = {
-     .getModels  = virCPUx86GetModels,
-     .translate  = virCPUx86Translate,
-     .expandFeatures = virCPUx86ExpandFeatures,
-+    .copyMigratable = virCPUx86CopyMigratable,
- };
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index b551cb86a..dc6db3b28 100644
--- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1016,6 +1016,7 @@ virCPUCheckFeature;
- virCPUCompare;
- virCPUCompareXML;
- virCPUConvertLegacy;
-+virCPUCopyMigratable;
- virCPUDataCheckFeature;
- virCPUDataFormat;
- virCPUDataFree;
@@ -0,0 +1,46 @@
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Wed, 13 Mar 2019 16:21:15 +0000
+Subject: [PATCH] network: avoid trying to create global firewall rules if
+ unprivileged
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The unprivileged libvirtd does not have permission to create firewall
+rules, or bridge devices, or do anything to the host network in
+general. Historically we still activate the network driver though and
+let the network start API call fail.
+
+The startup code path which reloads firewall rules on active networks
+would thus effectively be a no-op when unprivileged as it is impossible
+for there to be any active networks
+
+With the change to use a global set of firewall chains, however, we now
+have code that is run unconditionally.
+
+Ideally we would not register the network driver at all when
+unprivileged, but the entanglement with the virt drivers currently makes
+that impractical. As a temporary hack, we just make the firewall reload
+into a no-op.
+
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 5d010c3df6152cf5fb00f1f67d22151241f4a8a2)
+---
+ src/network/bridge_driver.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
+index 1da60f0a21..0e1d5efd8e 100644
+--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
+@@ -2108,6 +2108,10 @@ static void
+ networkReloadFirewallRules(virNetworkDriverStatePtr driver, bool startup)
+ {
+     VIR_INFO("Reloading iptables rules");
+    /* Ideally we'd not even register the driver when unprivilegd
+     * but until we untangle the virt driver that's not viable */
+    if (!driver->privileged)
+        return;
+     networkPreReloadFirewallRules(startup);
+     virNetworkObjListForEach(driver->networks,
+                              networkReloadFirewallRulesHelper,
@@ -0,0 +1,57 @@
+From: Andrea Bolognani <abologna@redhat.com>
+Date: Wed, 27 Feb 2019 18:41:35 +0100
+Subject: [PATCH] qemu: Allow creating ppc64 guests with graphics and no USB
+ mouse
+
+The existing behavior for ppc64 guests is to always add a USB
+keyboard and mouse combo if graphics are present; unfortunately,
+this means any attempt to use a USB tablet will cause both pointing
+devices to show up in the guest, which in turn will result in poor
+user experience.
+
+We can't just stop adding the USB mouse or start adding a USB tablet
+instead, because existing applications and users might rely on the
+current behavior; however, we can avoid adding the USB mouse if a USB
+tablet is already present, thus allowing users and applications to
+create guests that contain a single pointing device.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1683681
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Reviewed-by: Cole Robinson <crobinso@redhat.com>
+(cherry picked from commit 186bb479d0f409dc75175bea48a760838c479a6c)
+---
+ src/qemu/qemu_domain.c | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index 59fe1eb401..915795ab84 100644
+--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
+@@ -3476,6 +3476,26 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def,
+         virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_S390) && def->memballoon)
+         def->memballoon->model = VIR_DOMAIN_MEMBALLOON_MODEL_NONE;
+ 
+    if (addDefaultUSBMouse) {
+        bool hasUSBTablet = false;
+        size_t j;
+
+        for (j = 0; j < def->ninputs; j++) {
+            if (def->inputs[j]->type == VIR_DOMAIN_INPUT_TYPE_TABLET &&
+                def->inputs[j]->bus == VIR_DOMAIN_INPUT_BUS_USB) {
+                hasUSBTablet = true;
+                break;
+            }
+        }
+
+        /* Historically, we have automatically added USB keyboard and
+         * mouse to some guests. While the former device is generally
+         * safe to have, adding the latter is undesiderable if a USB
+         * tablet is already present in the guest */
+        if (hasUSBTablet)
+            addDefaultUSBMouse = false;
+    }
+
+     if (addDefaultUSBKBD &&
+         def->ngraphics > 0 &&
+         virDomainDefMaybeAddInput(def,
@@ -1,78 +0,0 @@
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 30 Mar 2017 13:50:44 +0200
-Subject: [PATCH] qemu: Move common code in virQEMUCapsInitCPUModel one layer
- up
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit d84b93fad51b190238e18b1daac82ea6e28869e9)
---
- src/qemu/qemu_capabilities.c | 25 ++++++++++---------------
- 1 file changed, 10 insertions(+), 15 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index b1245ad5d..1a15750a3 100644
--- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -3111,17 +3111,11 @@ virQEMUCapsCPUFilterFeatures(const char *name,
-  */
- static int
- virQEMUCapsInitCPUModelS390(virQEMUCapsPtr qemuCaps,
-                            virDomainVirtType type,
-+                            qemuMonitorCPUModelInfoPtr modelInfo,
-                             virCPUDefPtr cpu)
- {
-    qemuMonitorCPUModelInfoPtr modelInfo;
-     size_t i;
- 
-    if (type == VIR_DOMAIN_VIRT_KVM)
-        modelInfo = qemuCaps->kvmCPUModelInfo;
-    else
-        modelInfo = qemuCaps->tcgCPUModelInfo;
-
-     if (!modelInfo) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("missing host CPU model info from QEMU capabilities "
-@@ -3163,9 +3157,9 @@ virQEMUCapsInitCPUModelS390(virQEMUCapsPtr qemuCaps,
- static int
- virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps,
-                            virDomainVirtType type,
-+                           qemuMonitorCPUModelInfoPtr model,
-                            virCPUDefPtr cpu)
- {
-    qemuMonitorCPUModelInfoPtr model;
-     virCPUDataPtr data = NULL;
-     unsigned long long sigFamily = 0;
-     unsigned long long sigModel = 0;
-@@ -3174,11 +3168,6 @@ virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps,
-     int ret = -1;
-     size_t i;
- 
-    if (type == VIR_DOMAIN_VIRT_KVM)
-        model = qemuCaps->kvmCPUModelInfo;
-    else
-        model = qemuCaps->tcgCPUModelInfo;
-
-     if (!model)
-         return 1;
- 
-@@ -3239,12 +3228,18 @@ virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps,
-                         virDomainVirtType type,
-                         virCPUDefPtr cpu)
- {
-+    qemuMonitorCPUModelInfoPtr model;
-     int ret = 1;
- 
-+    if (type == VIR_DOMAIN_VIRT_KVM)
-+        model = qemuCaps->kvmCPUModelInfo;
-+    else
-+        model = qemuCaps->tcgCPUModelInfo;
-+
-     if (ARCH_IS_S390(qemuCaps->arch))
-        ret = virQEMUCapsInitCPUModelS390(qemuCaps, type, cpu);
-+        ret = virQEMUCapsInitCPUModelS390(qemuCaps, model, cpu);
-     else if (ARCH_IS_X86(qemuCaps->arch))
-        ret = virQEMUCapsInitCPUModelX86(qemuCaps, type, cpu);
-+        ret = virQEMUCapsInitCPUModelX86(qemuCaps, type, model, cpu);
- 
-     if (ret == 0)
-         cpu->fallback = VIR_CPU_FALLBACK_FORBID;
@@ -1,139 +0,0 @@
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 29 Mar 2017 13:33:50 +0200
-Subject: [PATCH] qemu: Add migratable parameter to virQEMUCapsInitCPUModel
-
-The caller can ask for a migratable CPU model by passing true for the
-new parameter.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 00e0cbcb567a57c7b5a145d7fd3fb662779f6bec)
---
- src/qemu/qemu_capabilities.c | 36 +++++++++++++++++++++++++-----------
- src/qemu/qemu_capspriv.h     |  3 ++-
- tests/cputest.c              |  2 +-
- 3 files changed, 28 insertions(+), 13 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 1a15750a3..b8e4e47b6 100644
--- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -3112,7 +3112,8 @@ virQEMUCapsCPUFilterFeatures(const char *name,
- static int
- virQEMUCapsInitCPUModelS390(virQEMUCapsPtr qemuCaps,
-                             qemuMonitorCPUModelInfoPtr modelInfo,
-                            virCPUDefPtr cpu)
-+                            virCPUDefPtr cpu,
-+                            bool migratable)
- {
-     size_t i;
- 
-@@ -3140,8 +3141,12 @@ virQEMUCapsInitCPUModelS390(virQEMUCapsPtr qemuCaps,
- 
-         if (VIR_STRDUP(feature->name, prop->name) < 0)
-             return -1;
-        feature->policy = prop->value.boolean ? VIR_CPU_FEATURE_REQUIRE
-                                              : VIR_CPU_FEATURE_DISABLE;
-+
-+        if (!prop->value.boolean ||
-+            (migratable && prop->migratable == VIR_TRISTATE_BOOL_NO))
-+            feature->policy = VIR_CPU_FEATURE_DISABLE;
-+        else
-+            feature->policy = VIR_CPU_FEATURE_REQUIRE;
-         cpu->nfeatures++;
-     }
- 
-@@ -3158,7 +3163,8 @@ static int
- virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps,
-                            virDomainVirtType type,
-                            qemuMonitorCPUModelInfoPtr model,
-                           virCPUDefPtr cpu)
-+                           virCPUDefPtr cpu,
-+                           bool migratable)
- {
-     virCPUDataPtr data = NULL;
-     unsigned long long sigFamily = 0;
-@@ -3179,9 +3185,13 @@ virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps,
- 
-         switch (prop->type) {
-         case QEMU_MONITOR_CPU_PROPERTY_BOOLEAN:
-            if (prop->value.boolean &&
-                virCPUx86DataAddFeature(data, prop->name) < 0)
-+            if (!prop->value.boolean ||
-+                (migratable && prop->migratable == VIR_TRISTATE_BOOL_NO))
-+                continue;
-+
-+            if (virCPUx86DataAddFeature(data, prop->name) < 0)
-                 goto cleanup;
-+
-             break;
- 
-         case QEMU_MONITOR_CPU_PROPERTY_STRING:
-@@ -3220,13 +3230,14 @@ virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps,
- 
- /**
-  * Returns  0 when host CPU model provided by QEMU was filled in qemuCaps,
- *          1 when the caller should fall back to using virCapsPtr->host.cpu,
-+ *          1 when the caller should fall back to other methods
-  *         -1 on error.
-  */
- int
- virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps,
-                         virDomainVirtType type,
-                        virCPUDefPtr cpu)
-+                        virCPUDefPtr cpu,
-+                        bool migratable)
- {
-     qemuMonitorCPUModelInfoPtr model;
-     int ret = 1;
-@@ -3236,10 +3247,13 @@ virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps,
-     else
-         model = qemuCaps->tcgCPUModelInfo;
- 
-+    if (migratable && model && !model->migratability)
-+        return 1;
-+
-     if (ARCH_IS_S390(qemuCaps->arch))
-        ret = virQEMUCapsInitCPUModelS390(qemuCaps, model, cpu);
-+        ret = virQEMUCapsInitCPUModelS390(qemuCaps, model, cpu, migratable);
-     else if (ARCH_IS_X86(qemuCaps->arch))
-        ret = virQEMUCapsInitCPUModelX86(qemuCaps, type, model, cpu);
-+        ret = virQEMUCapsInitCPUModelX86(qemuCaps, type, model, cpu, migratable);
- 
-     if (ret == 0)
-         cpu->fallback = VIR_CPU_FALLBACK_FORBID;
-@@ -3268,7 +3282,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
-     cpu->match = VIR_CPU_MATCH_EXACT;
-     cpu->fallback = VIR_CPU_FALLBACK_ALLOW;
- 
-    if ((rc = virQEMUCapsInitCPUModel(qemuCaps, type, cpu)) < 0) {
-+    if ((rc = virQEMUCapsInitCPUModel(qemuCaps, type, cpu, false)) < 0) {
-         goto error;
-     } else if (rc == 1) {
-         VIR_DEBUG("No host CPU model info from QEMU; probing host CPU directly");
-diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h
-index 61ccd4517..1baaaf334 100644
--- a/src/qemu/qemu_capspriv.h
-+++ b/src/qemu/qemu_capspriv.h
-@@ -81,7 +81,8 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
- int
- virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps,
-                         virDomainVirtType type,
-                        virCPUDefPtr cpu);
-+                        virCPUDefPtr cpu,
-+                        bool migratable);
- 
- void
- virQEMUCapsSetCPUModelInfo(virQEMUCapsPtr qemuCaps,
-diff --git a/tests/cputest.c b/tests/cputest.c
-index 3d3e43f16..8c07cf4f6 100644
--- a/tests/cputest.c
-+++ b/tests/cputest.c
-@@ -709,7 +709,7 @@ cpuTestJSONCPUID(const void *arg)
-     cpu->match = VIR_CPU_MATCH_EXACT;
-     cpu->fallback = VIR_CPU_FALLBACK_FORBID;
- 
-    if (virQEMUCapsInitCPUModel(qemuCaps, VIR_DOMAIN_VIRT_KVM, cpu) != 0)
-+    if (virQEMUCapsInitCPUModel(qemuCaps, VIR_DOMAIN_VIRT_KVM, cpu, false) != 0)
-         goto cleanup;
- 
-     ret = cpuTestCompareXML(data->arch, cpu, result, false);
@@ -0,0 +1,53 @@
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Tue, 19 Feb 2019 15:42:51 +0100
+Subject: [PATCH] util: implement virCgroupV2(Set|Get)CpusetMems
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+(cherry picked from commit 74e7da060543a87610b42fc6ba26a45b0a6e3974)
+---
+ src/util/vircgroupv2.c | 25 +++++++++++++++++++++++++
+ 1 file changed, 25 insertions(+)
+
+diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
+index e0fa8e1cc0..4cfbd52f2d 100644
+--- a/src/util/vircgroupv2.c
+++ b/src/util/vircgroupv2.c
+@@ -1561,6 +1561,28 @@ virCgroupV2GetCpuacctStat(virCgroupPtr group,
+ }
+ 
+ 
+static int
+virCgroupV2SetCpusetMems(virCgroupPtr group,
+                         const char *mems)
+{
+    return virCgroupSetValueStr(group,
+                                VIR_CGROUP_CONTROLLER_CPUSET,
+                                "cpuset.mems",
+                                mems);
+}
+
+
+static int
+virCgroupV2GetCpusetMems(virCgroupPtr group,
+                         char **mems)
+{
+    return virCgroupGetValueStr(group,
+                                VIR_CGROUP_CONTROLLER_CPUSET,
+                                "cpuset.mems",
+                                mems);
+}
+
+
+ virCgroupBackend virCgroupV2Backend = {
+     .type = VIR_CGROUP_BACKEND_TYPE_V2,
+ 
+@@ -1620,6 +1642,9 @@ virCgroupBackend virCgroupV2Backend = {
+ 
+     .getCpuacctUsage = virCgroupV2GetCpuacctUsage,
+     .getCpuacctStat = virCgroupV2GetCpuacctStat,
+
+    .setCpusetMems = virCgroupV2SetCpusetMems,
+    .getCpusetMems = virCgroupV2GetCpusetMems,
+ };
+ 
+ 
@@ -1,47 +0,0 @@
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 7 Apr 2017 17:03:38 +0200
-Subject: [PATCH] qemu: Introduce virQEMUCapsSetHostModel
-
-A simple helper as a complement to virQEMUCapsGetHostModel.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit bffc3b9fe501ff122ad81ddf42ecdb69f70ff70a)
---
- src/qemu/qemu_capabilities.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index b8e4e47b6..f6020b86d 100644
--- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -2419,6 +2419,18 @@ virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps,
- }
- 
- 
-+static void
-+virQEMUCapsSetHostModel(virQEMUCapsPtr qemuCaps,
-+                        virDomainVirtType type,
-+                        virCPUDefPtr cpu)
-+{
-+    if (type == VIR_DOMAIN_VIRT_KVM)
-+        qemuCaps->kvmCPUModel = cpu;
-+    else
-+        qemuCaps->tcgCPUModel = cpu;
-+}
-+
-+
- bool
- virQEMUCapsIsCPUModeSupported(virQEMUCapsPtr qemuCaps,
-                               virCapsPtr caps,
-@@ -3295,10 +3307,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
-             goto error;
-     }
- 
-    if (type == VIR_DOMAIN_VIRT_KVM)
-        qemuCaps->kvmCPUModel = cpu;
-    else
-        qemuCaps->tcgCPUModel = cpu;
-+    virQEMUCapsSetHostModel(qemuCaps, type, cpu);
- 
-  cleanup:
-     virCPUDefFree(hostCPU);
@@ -0,0 +1,50 @@
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Tue, 19 Feb 2019 15:53:34 +0100
+Subject: [PATCH] util: implement virCgroupV2(Set|Get)CpusetMemoryMigrate
+
+Cgroups v2 don't have memory_migrate interface and the migration is
+enabled by default.
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+(cherry picked from commit 77c1cf4da2f761a91756c09fa4fd37ae1802e650)
+---
+ src/util/vircgroupv2.c | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
+index 4cfbd52f2d..f3aa6ebc48 100644
+--- a/src/util/vircgroupv2.c
+++ b/src/util/vircgroupv2.c
+@@ -1583,6 +1583,23 @@ virCgroupV2GetCpusetMems(virCgroupPtr group,
+ }
+ 
+ 
+static int
+virCgroupV2SetCpusetMemoryMigrate(virCgroupPtr group ATTRIBUTE_UNUSED,
+                                  bool migrate ATTRIBUTE_UNUSED)
+{
+    return 0;
+}
+
+
+static int
+virCgroupV2GetCpusetMemoryMigrate(virCgroupPtr group ATTRIBUTE_UNUSED,
+                                  bool *migrate)
+{
+    *migrate = true;
+    return 0;
+}
+
+
+ virCgroupBackend virCgroupV2Backend = {
+     .type = VIR_CGROUP_BACKEND_TYPE_V2,
+ 
+@@ -1645,6 +1662,8 @@ virCgroupBackend virCgroupV2Backend = {
+ 
+     .setCpusetMems = virCgroupV2SetCpusetMems,
+     .getCpusetMems = virCgroupV2GetCpusetMems,
+    .setCpusetMemoryMigrate = virCgroupV2SetCpusetMemoryMigrate,
+    .getCpusetMemoryMigrate = virCgroupV2GetCpusetMemoryMigrate,
+ };
+ 
+ 
@@ -1,70 +0,0 @@
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 7 Apr 2017 17:40:31 +0200
-Subject: [PATCH] qemu: Move qemuCaps CPU data copying into a separate function
-
-This introduces virQEMUCapsHostCPUDataCopy which will later be
-refactored a bit and called twice from virQEMUCapsNewCopy.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 8be4346ca5ae4b568b3e8ce3de9cf46f2e94b416)
---
- src/qemu/qemu_capabilities.c | 39 +++++++++++++++++++++++++--------------
- 1 file changed, 25 insertions(+), 14 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index f6020b86d..d17e0e8b8 100644
--- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -2082,6 +2082,30 @@ virQEMUCapsNew(void)
- }
- 
- 
-+static int
-+virQEMUCapsHostCPUDataCopy(virQEMUCapsPtr dst,
-+                           virQEMUCapsPtr src)
-+{
-+    if (src->kvmCPUModel &&
-+        !(dst->kvmCPUModel = virCPUDefCopy(src->kvmCPUModel)))
-+        return -1;
-+
-+    if (src->tcgCPUModel &&
-+        !(dst->tcgCPUModel = virCPUDefCopy(src->tcgCPUModel)))
-+        return -1;
-+
-+    if (src->kvmCPUModelInfo &&
-+        !(dst->kvmCPUModelInfo = qemuMonitorCPUModelInfoCopy(src->kvmCPUModelInfo)))
-+        return -1;
-+
-+    if (src->tcgCPUModelInfo &&
-+        !(dst->tcgCPUModelInfo = qemuMonitorCPUModelInfoCopy(src->tcgCPUModelInfo)))
-+        return -1;
-+
-+    return 0;
-+}
-+
-+
- virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps)
- {
-     virQEMUCapsPtr ret = virQEMUCapsNew();
-@@ -2119,20 +2143,7 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps)
-             goto error;
-     }
- 
-    if (qemuCaps->kvmCPUModel &&
-        !(ret->kvmCPUModel = virCPUDefCopy(qemuCaps->kvmCPUModel)))
-        goto error;
-
-    if (qemuCaps->tcgCPUModel &&
-        !(ret->tcgCPUModel = virCPUDefCopy(qemuCaps->tcgCPUModel)))
-        goto error;
-
-    if (qemuCaps->kvmCPUModelInfo &&
-        !(ret->kvmCPUModelInfo = qemuMonitorCPUModelInfoCopy(qemuCaps->kvmCPUModelInfo)))
-        goto error;
-
-    if (qemuCaps->tcgCPUModelInfo &&
-        !(ret->tcgCPUModelInfo = qemuMonitorCPUModelInfoCopy(qemuCaps->tcgCPUModelInfo)))
-+    if (virQEMUCapsHostCPUDataCopy(ret, qemuCaps) < 0)
-         goto error;
- 
-     if (VIR_ALLOC_N(ret->machineTypes, qemuCaps->nmachineTypes) < 0)
@@ -0,0 +1,52 @@
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Tue, 19 Feb 2019 15:55:38 +0100
+Subject: [PATCH] util: implement virCgroupV2(Set|Get)CpusetCpus
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+(cherry picked from commit 3b72c84ff1c1b8b393ba9c2ccb004f8eb1ebda95)
+---
+ src/util/vircgroupv2.c | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
+index f3aa6ebc48..25afab1cad 100644
+--- a/src/util/vircgroupv2.c
+++ b/src/util/vircgroupv2.c
+@@ -1600,6 +1600,28 @@ virCgroupV2GetCpusetMemoryMigrate(virCgroupPtr group ATTRIBUTE_UNUSED,
+ }
+ 
+ 
+static int
+virCgroupV2SetCpusetCpus(virCgroupPtr group,
+                         const char *cpus)
+{
+    return virCgroupSetValueStr(group,
+                                VIR_CGROUP_CONTROLLER_CPUSET,
+                                "cpuset.cpus",
+                                cpus);
+}
+
+
+static int
+virCgroupV2GetCpusetCpus(virCgroupPtr group,
+                         char **cpus)
+{
+    return virCgroupGetValueStr(group,
+                                VIR_CGROUP_CONTROLLER_CPUSET,
+                                "cpuset.cpus",
+                                cpus);
+}
+
+
+ virCgroupBackend virCgroupV2Backend = {
+     .type = VIR_CGROUP_BACKEND_TYPE_V2,
+ 
+@@ -1664,6 +1686,8 @@ virCgroupBackend virCgroupV2Backend = {
+     .getCpusetMems = virCgroupV2GetCpusetMems,
+     .setCpusetMemoryMigrate = virCgroupV2SetCpusetMemoryMigrate,
+     .getCpusetMemoryMigrate = virCgroupV2GetCpusetMemoryMigrate,
+    .setCpusetCpus = virCgroupV2SetCpusetCpus,
+    .getCpusetCpus = virCgroupV2GetCpusetCpus,
+ };
+ 
+ 
@@ -1,67 +0,0 @@
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 7 Apr 2017 17:43:59 +0200
-Subject: [PATCH] qemu: Introduce virQEMUCapsHostCPUDataClear
-
-To keep freeing of host CPU data in one place.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit b0605e848724c5dc478382398b734398abff674c)
---
- src/qemu/qemu_capabilities.c | 30 +++++++++++++++++-------------
- 1 file changed, 17 insertions(+), 13 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index d17e0e8b8..2da53a60b 100644
--- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -2106,6 +2106,21 @@ virQEMUCapsHostCPUDataCopy(virQEMUCapsPtr dst,
- }
- 
- 
-+static void
-+virQEMUCapsHostCPUDataClear(virQEMUCapsPtr qemuCaps)
-+{
-+    qemuMonitorCPUModelInfoFree(qemuCaps->kvmCPUModelInfo);
-+    qemuMonitorCPUModelInfoFree(qemuCaps->tcgCPUModelInfo);
-+    qemuCaps->kvmCPUModelInfo = NULL;
-+    qemuCaps->tcgCPUModelInfo = NULL;
-+
-+    virCPUDefFree(qemuCaps->kvmCPUModel);
-+    virCPUDefFree(qemuCaps->tcgCPUModel);
-+    qemuCaps->kvmCPUModel = NULL;
-+    qemuCaps->tcgCPUModel = NULL;
-+}
-+
-+
- virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps)
- {
-     virQEMUCapsPtr ret = virQEMUCapsNew();
-@@ -2192,10 +2207,7 @@ void virQEMUCapsDispose(void *obj)
- 
-     VIR_FREE(qemuCaps->gicCapabilities);
- 
-    qemuMonitorCPUModelInfoFree(qemuCaps->kvmCPUModelInfo);
-    qemuMonitorCPUModelInfoFree(qemuCaps->tcgCPUModelInfo);
-    virCPUDefFree(qemuCaps->kvmCPUModel);
-    virCPUDefFree(qemuCaps->tcgCPUModel);
-+    virQEMUCapsHostCPUDataClear(qemuCaps);
- }
- 
- void
-@@ -4068,15 +4080,7 @@ virQEMUCapsReset(virQEMUCapsPtr qemuCaps)
-     VIR_FREE(qemuCaps->gicCapabilities);
-     qemuCaps->ngicCapabilities = 0;
- 
-    qemuMonitorCPUModelInfoFree(qemuCaps->kvmCPUModelInfo);
-    qemuMonitorCPUModelInfoFree(qemuCaps->tcgCPUModelInfo);
-    qemuCaps->kvmCPUModelInfo = NULL;
-    qemuCaps->tcgCPUModelInfo = NULL;
-
-    virCPUDefFree(qemuCaps->kvmCPUModel);
-    virCPUDefFree(qemuCaps->tcgCPUModel);
-    qemuCaps->kvmCPUModel = NULL;
-    qemuCaps->tcgCPUModel = NULL;
-+    virQEMUCapsHostCPUDataClear(qemuCaps);
- }
- 
- 
@@ -0,0 +1,30 @@
+From: Pavel Hrdina <phrdina@redhat.com>
+Date: Wed, 20 Feb 2019 13:50:23 +0100
+Subject: [PATCH] util: enable cgroups v2 cpuset controller for threads
+
+When we create cgroup for qemu threads we need to enable cpuset
+controller in order to use it.
+
+Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
+(cherry picked from commit a6aedcf39bd3212a3cd624b765bb724fd36d6a8a)
+---
+ src/util/vircgroupv2.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
+index 25afab1cad..4084929c5a 100644
+--- a/src/util/vircgroupv2.c
+++ b/src/util/vircgroupv2.c
+@@ -400,6 +400,12 @@ virCgroupV2MakeGroup(virCgroupPtr parent ATTRIBUTE_UNUSED,
+                                             VIR_CGROUP_CONTROLLER_CPU) < 0) {
+                 return -1;
+             }
+
+            if (virCgroupV2HasController(parent, VIR_CGROUP_CONTROLLER_CPUSET) &&
+                virCgroupV2EnableController(parent,
+                                            VIR_CGROUP_CONTROLLER_CPUSET) < 0) {
+                return -1;
+            }
+         } else {
+             size_t i;
+             for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) {
@@ -0,0 +1,51 @@
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Fri, 5 Apr 2019 11:33:32 +0200
+Subject: [PATCH] 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 d3a88da21d..470de83a87 100644
+--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
+@@ -165,7 +165,6 @@ struct _virCPUx86Map {
+ };
+ 
+ static virCPUx86MapPtr cpuMap;
+-static unsigned int microcodeVersion;
+ 
+ int virCPUx86DriverOnceInit(void);
+ VIR_ONCE_GLOBAL_INIT(virCPUx86Driver);
+@@ -1332,8 +1331,6 @@ virCPUx86DriverOnceInit(void)
+     if (!(cpuMap = virCPUx86LoadMap()))
+         return -1;
+ 
+-    microcodeVersion = virHostCPUGetMicrocodeVersion();
+-
+     return 0;
+ }
+ 
+@@ -2373,7 +2370,7 @@ virCPUx86GetHost(virCPUDefPtr cpu,
+         goto cleanup;
+ 
+     ret = x86DecodeCPUData(cpu, cpuData, models);
+-    cpu->microcodeVersion = microcodeVersion;
+    cpu->microcodeVersion = virHostCPUGetMicrocodeVersion();
+ 
+  cleanup:
+     virCPUx86DataFree(cpuData);
@@ -1,342 +0,0 @@
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 7 Apr 2017 18:15:26 +0200
-Subject: [PATCH] qemu: Move qemuCaps host CPU data in a struct
-
-We need to store several CPU related data structure for both KVM and
-TCG. So instead of keeping two different copies of everything let's
-make a virQEMUCapsHostCPUData struct and use it twice.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit b0a84ffb7f38f990120c231cfb74956a0ed10d95)
---
- src/qemu/qemu_capabilities.c | 168 +++++++++++++++++++++----------------------
- 1 file changed, 82 insertions(+), 86 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 2da53a60b..bbb234538 100644
--- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -373,6 +373,19 @@ struct virQEMUCapsMachineType {
-     unsigned int maxCpus;
-     bool hotplugCpus;
- };
-+
-+typedef struct _virQEMUCapsHostCPUData virQEMUCapsHostCPUData;
-+typedef virQEMUCapsHostCPUData *virQEMUCapsHostCPUDataPtr;
-+struct _virQEMUCapsHostCPUData {
-+    /* Only the "info" part is stored in the capabilities cache, the rest is
-+     * re-computed from other fields and external data sources everytime we
-+     * probe QEMU or load the cache.
-+     */
-+    qemuMonitorCPUModelInfoPtr info;
-+    /* Host CPU definition reported in domain capabilities. */
-+    virCPUDefPtr reported;
-+};
-+
- /*
-  * Update the XML parser/formatter when adding more
-  * information to this struct so that it gets cached
-@@ -407,15 +420,8 @@ struct _virQEMUCaps {
-     size_t ngicCapabilities;
-     virGICCapability *gicCapabilities;
- 
-    qemuMonitorCPUModelInfoPtr kvmCPUModelInfo;
-    qemuMonitorCPUModelInfoPtr tcgCPUModelInfo;
-
-    /* Anything below is not stored in the cache since the values are
-     * re-computed from the other fields or external data sources every
-     * time we probe QEMU or load the results from the cache.
-     */
-    virCPUDefPtr kvmCPUModel;
-    virCPUDefPtr tcgCPUModel;
-+    virQEMUCapsHostCPUData kvmCPU;
-+    virQEMUCapsHostCPUData tcgCPU;
- };
- 
- struct virQEMUCapsSearchData {
-@@ -2083,23 +2089,15 @@ virQEMUCapsNew(void)
- 
- 
- static int
-virQEMUCapsHostCPUDataCopy(virQEMUCapsPtr dst,
-                           virQEMUCapsPtr src)
-+virQEMUCapsHostCPUDataCopy(virQEMUCapsHostCPUDataPtr dst,
-+                           virQEMUCapsHostCPUDataPtr src)
- {
-    if (src->kvmCPUModel &&
-        !(dst->kvmCPUModel = virCPUDefCopy(src->kvmCPUModel)))
-+    if (src->info &&
-+        !(dst->info = qemuMonitorCPUModelInfoCopy(src->info)))
-         return -1;
- 
-    if (src->tcgCPUModel &&
-        !(dst->tcgCPUModel = virCPUDefCopy(src->tcgCPUModel)))
-        return -1;
-
-    if (src->kvmCPUModelInfo &&
-        !(dst->kvmCPUModelInfo = qemuMonitorCPUModelInfoCopy(src->kvmCPUModelInfo)))
-        return -1;
-
-    if (src->tcgCPUModelInfo &&
-        !(dst->tcgCPUModelInfo = qemuMonitorCPUModelInfoCopy(src->tcgCPUModelInfo)))
-+    if (src->reported &&
-+        !(dst->reported = virCPUDefCopy(src->reported)))
-         return -1;
- 
-     return 0;
-@@ -2107,17 +2105,12 @@ virQEMUCapsHostCPUDataCopy(virQEMUCapsPtr dst,
- 
- 
- static void
-virQEMUCapsHostCPUDataClear(virQEMUCapsPtr qemuCaps)
-+virQEMUCapsHostCPUDataClear(virQEMUCapsHostCPUDataPtr cpuData)
- {
-    qemuMonitorCPUModelInfoFree(qemuCaps->kvmCPUModelInfo);
-    qemuMonitorCPUModelInfoFree(qemuCaps->tcgCPUModelInfo);
-    qemuCaps->kvmCPUModelInfo = NULL;
-    qemuCaps->tcgCPUModelInfo = NULL;
-
-    virCPUDefFree(qemuCaps->kvmCPUModel);
-    virCPUDefFree(qemuCaps->tcgCPUModel);
-    qemuCaps->kvmCPUModel = NULL;
-    qemuCaps->tcgCPUModel = NULL;
-+    qemuMonitorCPUModelInfoFree(cpuData->info);
-+    virCPUDefFree(cpuData->reported);
-+
-+    memset(cpuData, 0, sizeof(*cpuData));
- }
- 
- 
-@@ -2158,7 +2151,8 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps)
-             goto error;
-     }
- 
-    if (virQEMUCapsHostCPUDataCopy(ret, qemuCaps) < 0)
-+    if (virQEMUCapsHostCPUDataCopy(&ret->kvmCPU, &qemuCaps->kvmCPU) < 0 ||
-+        virQEMUCapsHostCPUDataCopy(&ret->tcgCPU, &qemuCaps->tcgCPU) < 0)
-         goto error;
- 
-     if (VIR_ALLOC_N(ret->machineTypes, qemuCaps->nmachineTypes) < 0)
-@@ -2207,7 +2201,8 @@ void virQEMUCapsDispose(void *obj)
- 
-     VIR_FREE(qemuCaps->gicCapabilities);
- 
-    virQEMUCapsHostCPUDataClear(qemuCaps);
-+    virQEMUCapsHostCPUDataClear(&qemuCaps->kvmCPU);
-+    virQEMUCapsHostCPUDataClear(&qemuCaps->tcgCPU);
- }
- 
- void
-@@ -2431,14 +2426,24 @@ virQEMUCapsGetCPUDefinitions(virQEMUCapsPtr qemuCaps,
- }
- 
- 
-+static virQEMUCapsHostCPUDataPtr
-+virQEMUCapsGetHostCPUData(virQEMUCapsPtr qemuCaps,
-+                          virDomainVirtType type)
-+{
-+    if (type == VIR_DOMAIN_VIRT_KVM)
-+        return &qemuCaps->kvmCPU;
-+    else
-+        return &qemuCaps->tcgCPU;
-+}
-+
-+
- virCPUDefPtr
- virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps,
-                         virDomainVirtType type)
- {
-    if (type == VIR_DOMAIN_VIRT_KVM)
-        return qemuCaps->kvmCPUModel;
-    else
-        return qemuCaps->tcgCPUModel;
-+    virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type);
-+
-+    return cpuData->reported;
- }
- 
- 
-@@ -2447,10 +2452,9 @@ virQEMUCapsSetHostModel(virQEMUCapsPtr qemuCaps,
-                         virDomainVirtType type,
-                         virCPUDefPtr cpu)
- {
-    if (type == VIR_DOMAIN_VIRT_KVM)
-        qemuCaps->kvmCPUModel = cpu;
-    else
-        qemuCaps->tcgCPUModel = cpu;
-+    virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type);
-+
-+    cpuData->reported = cpu;
- }
- 
- 
-@@ -2841,24 +2845,28 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps,
-                            qemuMonitorPtr mon,
-                            bool tcg)
- {
-    qemuMonitorCPUModelInfoPtr *modelInfo;
-+    qemuMonitorCPUModelInfoPtr modelInfo = NULL;
-     qemuMonitorCPUModelInfoPtr nonMigratable = NULL;
-     virHashTablePtr hash = NULL;
-     const char *model;
-     qemuMonitorCPUModelExpansionType type;
-+    virDomainVirtType virtType;
-+    virQEMUCapsHostCPUDataPtr cpuData;
-     int ret = -1;
- 
-     if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION))
-         return 0;
- 
-     if (tcg || !virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) {
-        modelInfo = &qemuCaps->tcgCPUModelInfo;
-+        virtType = VIR_DOMAIN_VIRT_QEMU;
-         model = "max";
-     } else {
-        modelInfo = &qemuCaps->kvmCPUModelInfo;
-+        virtType = VIR_DOMAIN_VIRT_KVM;
-         model = "host";
-     }
- 
-+    cpuData = virQEMUCapsGetHostCPUData(qemuCaps, virtType);
-+
-     /* Some x86_64 features defined in cpu_map.xml use spelling which differ
-      * from the one preferred by QEMU. Static expansion would give us only the
-      * preferred spelling, thus we need to do a full expansion on the result of
-@@ -2869,14 +2877,14 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps,
-     else
-         type = QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC;
- 
-    if (qemuMonitorGetCPUModelExpansion(mon, type, model, true, modelInfo) < 0)
-        return -1;
-+    if (qemuMonitorGetCPUModelExpansion(mon, type, model, true, &modelInfo) < 0)
-+        goto cleanup;
- 
-     /* Try to check migratability of each feature. */
-    if (*modelInfo &&
-+    if (modelInfo &&
-         qemuMonitorGetCPUModelExpansion(mon, type, model, false,
-                                         &nonMigratable) < 0)
-        goto error;
-+        goto cleanup;
- 
-     if (nonMigratable) {
-         qemuMonitorCPUPropertyPtr prop;
-@@ -2884,12 +2892,12 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps,
-         size_t i;
- 
-         if (!(hash = virHashCreate(0, NULL)))
-            goto error;
-+            goto cleanup;
- 
-        for (i = 0; i < (*modelInfo)->nprops; i++) {
-            prop = (*modelInfo)->props + i;
-+        for (i = 0; i < modelInfo->nprops; i++) {
-+            prop = modelInfo->props + i;
-             if (virHashAddEntry(hash, prop->name, prop) < 0)
-                goto error;
-+                goto cleanup;
-         }
- 
-         for (i = 0; i < nonMigratable->nprops; i++) {
-@@ -2907,21 +2915,18 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps,
-             }
-         }
- 
-        (*modelInfo)->migratability = true;
-+        modelInfo->migratability = true;
-     }
- 
-+    VIR_STEAL_PTR(cpuData->info, modelInfo);
-     ret = 0;
- 
-  cleanup:
-     virHashFree(hash);
-     qemuMonitorCPUModelInfoFree(nonMigratable);
-+    qemuMonitorCPUModelInfoFree(modelInfo);
- 
-     return ret;
-
- error:
-    qemuMonitorCPUModelInfoFree(*modelInfo);
-    *modelInfo = NULL;
-    goto cleanup;
- }
- 
- struct tpmTypeToCaps {
-@@ -3274,21 +3279,19 @@ virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps,
-                         virCPUDefPtr cpu,
-                         bool migratable)
- {
-    qemuMonitorCPUModelInfoPtr model;
-+    virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type);
-     int ret = 1;
- 
-    if (type == VIR_DOMAIN_VIRT_KVM)
-        model = qemuCaps->kvmCPUModelInfo;
-    else
-        model = qemuCaps->tcgCPUModelInfo;
-
-    if (migratable && model && !model->migratability)
-+    if (migratable && cpuData->info && !cpuData->info->migratability)
-         return 1;
- 
-    if (ARCH_IS_S390(qemuCaps->arch))
-        ret = virQEMUCapsInitCPUModelS390(qemuCaps, model, cpu, migratable);
-    else if (ARCH_IS_X86(qemuCaps->arch))
-        ret = virQEMUCapsInitCPUModelX86(qemuCaps, type, model, cpu, migratable);
-+    if (ARCH_IS_S390(qemuCaps->arch)) {
-+        ret = virQEMUCapsInitCPUModelS390(qemuCaps, cpuData->info,
-+                                          cpu, migratable);
-+    } else if (ARCH_IS_X86(qemuCaps->arch)) {
-+        ret = virQEMUCapsInitCPUModelX86(qemuCaps, type, cpuData->info,
-+                                         cpu, migratable);
-+    }
- 
-     if (ret == 0)
-         cpu->fallback = VIR_CPU_FALLBACK_FORBID;
-@@ -3348,10 +3351,9 @@ virQEMUCapsSetCPUModelInfo(virQEMUCapsPtr qemuCaps,
-                            virDomainVirtType type,
-                            qemuMonitorCPUModelInfoPtr modelInfo)
- {
-    if (type == VIR_DOMAIN_VIRT_KVM)
-        qemuCaps->kvmCPUModelInfo = modelInfo;
-    else
-        qemuCaps->tcgCPUModelInfo = modelInfo;
-+    virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type);
-+
-+    cpuData->info = modelInfo;
- }
- 
- 
-@@ -3810,18 +3812,11 @@ virQEMUCapsFormatHostCPUModelInfo(virQEMUCapsPtr qemuCaps,
-                                   virBufferPtr buf,
-                                   virDomainVirtType type)
- {
-    qemuMonitorCPUModelInfoPtr model;
-    const char *typeStr;
-+    virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type);
-+    qemuMonitorCPUModelInfoPtr model = cpuData->info;
-+    const char *typeStr = type == VIR_DOMAIN_VIRT_KVM ? "kvm" : "tcg";
-     size_t i;
- 
-    if (type == VIR_DOMAIN_VIRT_KVM) {
-        typeStr = "kvm";
-        model = qemuCaps->kvmCPUModelInfo;
-    } else {
-        typeStr = "tcg";
-        model = qemuCaps->tcgCPUModelInfo;
-    }
-
-     if (!model)
-         return;
- 
-@@ -4080,7 +4075,8 @@ virQEMUCapsReset(virQEMUCapsPtr qemuCaps)
-     VIR_FREE(qemuCaps->gicCapabilities);
-     qemuCaps->ngicCapabilities = 0;
- 
-    virQEMUCapsHostCPUDataClear(qemuCaps);
-+    virQEMUCapsHostCPUDataClear(&qemuCaps->kvmCPU);
-+    virQEMUCapsHostCPUDataClear(&qemuCaps->tcgCPU);
- }
- 
- 
@@ -0,0 +1,143 @@
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Fri, 12 Apr 2019 21:21:05 +0200
+Subject: [PATCH] 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)
+---
+ 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 b48bcbebee..e5b1c90253 100644
+--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
+@@ -4487,7 +4487,7 @@ virQEMUCapsNewData(const char *binary,
+                                            priv->libDir,
+                                            priv->runUid,
+                                            priv->runGid,
+-                                           priv->microcodeVersion,
+                                           virHostCPUGetMicrocodeVersion(),
+                                            priv->kernelVersion);
+ }
+ 
+@@ -4570,8 +4570,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;
+@@ -4595,7 +4594,6 @@ virQEMUCapsCacheNew(const char *libDir,
+ 
+     priv->runUid = runUid;
+     priv->runGid = runGid;
+-    priv->microcodeVersion = microcodeVersion;
+     priv->kvmUsable = VIR_TRISTATE_BOOL_ABSENT;
+ 
+     if (uname(&uts) == 0 &&
+@@ -4617,8 +4615,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);
+@@ -4672,6 +4673,7 @@ virQEMUCapsPtr
+ virQEMUCapsCacheLookupByArch(virFileCachePtr cache,
+                              virArch arch)
+ {
+    virQEMUCapsCachePrivPtr priv = virFileCacheGetPriv(cache);
+     virQEMUCapsPtr ret = NULL;
+     const char *binaryFilters[] = {
+         "qemu-system-",
+@@ -4684,6 +4686,8 @@ virQEMUCapsCacheLookupByArch(virFileCachePtr cache,
+     size_t i;
+     size_t j;
+ 
+    priv->microcodeVersion = virHostCPUGetMicrocodeVersion();
+
+     for (i = 0; i < ARRAY_CARDINALITY(binaryFilters); i++) {
+         for (j = 0; j < ARRAY_CARDINALITY(archs); j++) {
+             struct virQEMUCapsSearchData data = {
+diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
+index ba84052bca..a6a655ac0f 100644
+--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
+@@ -587,8 +587,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 36426cd65a..75d31efd14 100644
+--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
+@@ -585,8 +585,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;
+@@ -809,15 +807,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 1736bad032..e30c0599ad 100644
+--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
+@@ -740,7 +740,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;
+ 
@@ -1,119 +0,0 @@
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Tue, 11 Apr 2017 11:14:30 +0200
-Subject: [PATCH] qemu: Prepare qemuCaps for multiple host CPU defs
-
-Soon we will need to store multiple host CPU definitions in
-virQEMUCapsHostCPUData and qemuCaps users will want to request the one
-they need. This patch introduces virQEMUCapsHostCPUType enum which will
-be used for specifying the requested CPU definition.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 1fe517c68df92eb7f379fa87cb0d29d566aad6f4)
---
- src/qemu/qemu_capabilities.c | 16 ++++++++++++----
- src/qemu/qemu_capabilities.h | 10 +++++++++-
- src/qemu/qemu_command.c      |  3 ++-
- src/qemu/qemu_process.c      |  6 ++++--
- 4 files changed, 27 insertions(+), 8 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index bbb234538..a6324a398 100644
--- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -2439,11 +2439,17 @@ virQEMUCapsGetHostCPUData(virQEMUCapsPtr qemuCaps,
- 
- virCPUDefPtr
- virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps,
-                        virDomainVirtType type)
-+                        virDomainVirtType type,
-+                        virQEMUCapsHostCPUType cpuType)
- {
-     virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type);
- 
-    return cpuData->reported;
-+    switch (cpuType) {
-+    case VIR_QEMU_CAPS_HOST_CPU_REPORTED:
-+        return cpuData->reported;
-+    }
-+
-+    return NULL;
- }
- 
- 
-@@ -2472,7 +2478,8 @@ virQEMUCapsIsCPUModeSupported(virQEMUCapsPtr qemuCaps,
-                virQEMUCapsGuestIsNative(caps->host.arch, qemuCaps->arch);
- 
-     case VIR_CPU_MODE_HOST_MODEL:
-        return !!virQEMUCapsGetHostModel(qemuCaps, type);
-+        return !!virQEMUCapsGetHostModel(qemuCaps, type,
-+                                         VIR_QEMU_CAPS_HOST_CPU_REPORTED);
- 
-     case VIR_CPU_MODE_CUSTOM:
-         if (type == VIR_DOMAIN_VIRT_KVM)
-@@ -5456,7 +5463,8 @@ virQEMUCapsFillDomainCPUCaps(virCapsPtr caps,
- 
-     if (virQEMUCapsIsCPUModeSupported(qemuCaps, caps, domCaps->virttype,
-                                       VIR_CPU_MODE_HOST_MODEL)) {
-        virCPUDefPtr cpu = virQEMUCapsGetHostModel(qemuCaps, domCaps->virttype);
-+        virCPUDefPtr cpu = virQEMUCapsGetHostModel(qemuCaps, domCaps->virttype,
-+                                                   VIR_QEMU_CAPS_HOST_CPU_REPORTED);
-         domCaps->cpu.hostModel = virCPUDefCopy(cpu);
-     }
- 
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index d44682f2a..88e27855b 100644
--- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -449,8 +449,16 @@ int virQEMUCapsGetCPUDefinitions(virQEMUCapsPtr qemuCaps,
-                                  virDomainVirtType type,
-                                  char ***names,
-                                  size_t *count);
-+
-+typedef enum {
-+    /* Host CPU definition reported in domain capabilities. */
-+    VIR_QEMU_CAPS_HOST_CPU_REPORTED,
-+} virQEMUCapsHostCPUType;
-+
- virCPUDefPtr virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps,
-                                     virDomainVirtType type);
-+                                     virDomainVirtType type,
-+                                     virQEMUCapsHostCPUType cpuType);
-+
- bool virQEMUCapsIsCPUModeSupported(virQEMUCapsPtr qemuCaps,
-                                    virCapsPtr caps,
-                                    virDomainVirtType type,
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 3abfe7b55..311edd13e 100644
--- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -6879,7 +6879,8 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
-             if (def->cpu->mode == VIR_CPU_MODE_CUSTOM)
-                 cpuDef = def->cpu;
-             else if (def->cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH)
-                cpuDef = virQEMUCapsGetHostModel(qemuCaps, def->virtType);
-+                cpuDef = virQEMUCapsGetHostModel(qemuCaps, def->virtType,
-+                                                 VIR_QEMU_CAPS_HOST_CPU_REPORTED);
- 
-             if (cpuDef) {
-                 int svm = virCPUCheckFeature(def->os.arch, cpuDef, "svm");
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 26a668d27..07a88a3a7 100644
--- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -5299,12 +5299,14 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def,
- 
-     if (def->cpu->check == VIR_CPU_CHECK_PARTIAL &&
-         virCPUCompare(caps->host.arch,
-                      virQEMUCapsGetHostModel(qemuCaps, def->virtType),
-+                      virQEMUCapsGetHostModel(qemuCaps, def->virtType,
-+                                              VIR_QEMU_CAPS_HOST_CPU_REPORTED),
-                       def->cpu, true) < 0)
-         return -1;
- 
-     if (virCPUUpdate(def->os.arch, def->cpu,
-                     virQEMUCapsGetHostModel(qemuCaps, def->virtType)) < 0)
-+                     virQEMUCapsGetHostModel(qemuCaps, def->virtType,
-+                                             VIR_QEMU_CAPS_HOST_CPU_REPORTED)) < 0)
-         goto cleanup;
- 
-     if (virQEMUCapsGetCPUDefinitions(qemuCaps, def->virtType,
@@ -0,0 +1,876 @@
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 9 Apr 2019 12:35:51 +0200
+Subject: [PATCH] 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
+
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit 5cd9db3ac11e88846cbcf95fad9f6fae9d880dee)
+---
+ 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    |  28 +
+ .../x86_64-cpuid-Xeon-E3-1225-v5-host.xml     |  29 +
+ .../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, 787 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 b75d864d8e..5866ca9edb 100644
+--- a/tests/cputest.c
+++ b/tests/cputest.c
+@@ -1184,6 +1184,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..70a0fc3286
+--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
+@@ -0,0 +1,28 @@
+<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='intel-pt'/>
+  <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..bbdfb6aa61
+--- /dev/null
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
+@@ -0,0 +1,29 @@
+<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='intel-pt'/>
+  <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>
@@ -1,210 +0,0 @@
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 29 Mar 2017 15:31:17 +0200
-Subject: [PATCH] qemu: Pass migratable host CPU model to virCPUUpdate
-
-We already know from QEMU which CPU features will block migration. Let's
-use this information to make a migratable copy of the host CPU model and
-use it for updating guest CPU specification. This will allow us to drop
-feature filtering from virCPUUpdate where it was just a hack.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 56bd7edcb5dc878beffb80d4e6a9cfb812378ded)
---
- src/qemu/qemu_capabilities.c | 57 +++++++++++++++++++++++++++++++++++++-------
- src/qemu/qemu_capabilities.h |  2 ++
- src/qemu/qemu_process.c      |  2 +-
- tests/cputest.c              |  7 +++++-
- 4 files changed, 57 insertions(+), 11 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index a6324a398..7fc577546 100644
--- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -384,6 +384,8 @@ struct _virQEMUCapsHostCPUData {
-     qemuMonitorCPUModelInfoPtr info;
-     /* Host CPU definition reported in domain capabilities. */
-     virCPUDefPtr reported;
-+    /* Migratable host CPU definition used for updating guest CPU. */
-+    virCPUDefPtr migratable;
- };
- 
- /*
-@@ -2100,6 +2102,10 @@ virQEMUCapsHostCPUDataCopy(virQEMUCapsHostCPUDataPtr dst,
-         !(dst->reported = virCPUDefCopy(src->reported)))
-         return -1;
- 
-+    if (src->migratable &&
-+        !(dst->migratable = virCPUDefCopy(src->migratable)))
-+        return -1;
-+
-     return 0;
- }
- 
-@@ -2109,6 +2115,7 @@ virQEMUCapsHostCPUDataClear(virQEMUCapsHostCPUDataPtr cpuData)
- {
-     qemuMonitorCPUModelInfoFree(cpuData->info);
-     virCPUDefFree(cpuData->reported);
-+    virCPUDefFree(cpuData->migratable);
- 
-     memset(cpuData, 0, sizeof(*cpuData));
- }
-@@ -2447,6 +2454,9 @@ virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps,
-     switch (cpuType) {
-     case VIR_QEMU_CAPS_HOST_CPU_REPORTED:
-         return cpuData->reported;
-+
-+    case VIR_QEMU_CAPS_HOST_CPU_MIGRATABLE:
-+        return cpuData->migratable;
-     }
- 
-     return NULL;
-@@ -2456,11 +2466,13 @@ virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps,
- static void
- virQEMUCapsSetHostModel(virQEMUCapsPtr qemuCaps,
-                         virDomainVirtType type,
-                        virCPUDefPtr cpu)
-+                        virCPUDefPtr reported,
-+                        virCPUDefPtr migratable)
- {
-     virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type);
- 
-    cpuData->reported = cpu;
-+    cpuData->reported = reported;
-+    cpuData->migratable = migratable;
- }
- 
- 
-@@ -3307,26 +3319,39 @@ virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps,
- }
- 
- 
-+static virCPUDefPtr
-+virQEMUCapsNewHostCPUModel(void)
-+{
-+    virCPUDefPtr cpu;
-+
-+    if (VIR_ALLOC(cpu) < 0)
-+        return NULL;
-+
-+    cpu->type = VIR_CPU_TYPE_GUEST;
-+    cpu->mode = VIR_CPU_MODE_CUSTOM;
-+    cpu->match = VIR_CPU_MATCH_EXACT;
-+    cpu->fallback = VIR_CPU_FALLBACK_ALLOW;
-+
-+    return cpu;
-+}
-+
-+
- void
- virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
-                             virCapsPtr caps,
-                             virDomainVirtType type)
- {
-     virCPUDefPtr cpu = NULL;
-+    virCPUDefPtr migCPU = NULL;
-     virCPUDefPtr hostCPU = NULL;
-     int rc;
- 
-     if (!caps || !virQEMUCapsGuestIsNative(caps->host.arch, qemuCaps->arch))
-         return;
- 
-    if (VIR_ALLOC(cpu) < 0)
-+    if (!(cpu = virQEMUCapsNewHostCPUModel()))
-         goto error;
- 
-    cpu->type = VIR_CPU_TYPE_GUEST;
-    cpu->mode = VIR_CPU_MODE_CUSTOM;
-    cpu->match = VIR_CPU_MATCH_EXACT;
-    cpu->fallback = VIR_CPU_FALLBACK_ALLOW;
-
-     if ((rc = virQEMUCapsInitCPUModel(qemuCaps, type, cpu, false)) < 0) {
-         goto error;
-     } else if (rc == 1) {
-@@ -3340,7 +3365,20 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
-             goto error;
-     }
- 
-    virQEMUCapsSetHostModel(qemuCaps, type, cpu);
-+    if (!(migCPU = virQEMUCapsNewHostCPUModel()))
-+        goto error;
-+
-+    if ((rc = virQEMUCapsInitCPUModel(qemuCaps, type, migCPU, true)) < 0) {
-+        goto error;
-+    } else if (rc == 1) {
-+        VIR_DEBUG("CPU migratability not provided by QEMU");
-+
-+        virCPUDefFree(migCPU);
-+        if (!(migCPU = virCPUCopyMigratable(qemuCaps->arch, cpu)))
-+            goto error;
-+    }
-+
-+    virQEMUCapsSetHostModel(qemuCaps, type, cpu, migCPU);
- 
-  cleanup:
-     virCPUDefFree(hostCPU);
-@@ -3348,6 +3386,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
- 
-  error:
-     virCPUDefFree(cpu);
-+    virCPUDefFree(migCPU);
-     virResetLastError();
-     goto cleanup;
- }
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 88e27855b..31818c940 100644
--- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -453,6 +453,8 @@ int virQEMUCapsGetCPUDefinitions(virQEMUCapsPtr qemuCaps,
- typedef enum {
-     /* Host CPU definition reported in domain capabilities. */
-     VIR_QEMU_CAPS_HOST_CPU_REPORTED,
-+    /* Migratable host CPU definition used for updating guest CPU. */
-+    VIR_QEMU_CAPS_HOST_CPU_MIGRATABLE,
- } virQEMUCapsHostCPUType;
- 
- virCPUDefPtr virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps,
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 07a88a3a7..e67736638 100644
--- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -5306,7 +5306,7 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def,
- 
-     if (virCPUUpdate(def->os.arch, def->cpu,
-                      virQEMUCapsGetHostModel(qemuCaps, def->virtType,
-                                             VIR_QEMU_CAPS_HOST_CPU_REPORTED)) < 0)
-+                                             VIR_QEMU_CAPS_HOST_CPU_MIGRATABLE)) < 0)
-         goto cleanup;
- 
-     if (virQEMUCapsGetCPUDefinitions(qemuCaps, def->virtType,
-diff --git a/tests/cputest.c b/tests/cputest.c
-index 8c07cf4f6..efa891dc1 100644
--- a/tests/cputest.c
-+++ b/tests/cputest.c
-@@ -393,6 +393,7 @@ cpuTestUpdate(const void *arg)
-     const struct data *data = arg;
-     int ret = -1;
-     virCPUDefPtr host = NULL;
-+    virCPUDefPtr migHost = NULL;
-     virCPUDefPtr cpu = NULL;
-     char *result = NULL;
- 
-@@ -400,7 +401,10 @@ cpuTestUpdate(const void *arg)
-         !(cpu = cpuTestLoadXML(data->arch, data->name)))
-         goto cleanup;
- 
-    if (virCPUUpdate(host->arch, cpu, host) < 0)
-+    if (!(migHost = virCPUCopyMigratable(data->arch, host)))
-+        goto cleanup;
-+
-+    if (virCPUUpdate(host->arch, cpu, migHost) < 0)
-         goto cleanup;
- 
-     if (virAsprintf(&result, "%s+%s", data->host, data->name) < 0)
-@@ -411,6 +415,7 @@ cpuTestUpdate(const void *arg)
-  cleanup:
-     virCPUDefFree(host);
-     virCPUDefFree(cpu);
-+    virCPUDefFree(migHost);
-     VIR_FREE(result);
-     return ret;
- }
@@ -1,49 +0,0 @@
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 29 Mar 2017 15:00:21 +0200
-Subject: [PATCH] cpu: Drop feature filtering from virCPUUpdate
-
-Because of the changes done in the previous commit, @host is already a
-migratable CPU and there's no need to do any additional filtering.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 232d87c7dd081d126a079fb45178e0be096cc680)
---
- src/cpu/cpu_x86.c | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index a771b251e..53359ff9b 100644
--- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -2549,8 +2549,7 @@ x86Baseline(virCPUDefPtr *cpus,
- 
- static int
- x86UpdateHostModel(virCPUDefPtr guest,
-                   const virCPUDef *host,
-                   virCPUx86MapPtr map)
-+                   const virCPUDef *host)
- {
-     virCPUDefPtr updated = NULL;
-     size_t i;
-@@ -2559,11 +2558,9 @@ x86UpdateHostModel(virCPUDefPtr guest,
-     if (!(updated = virCPUDefCopyWithoutModel(host)))
-         goto cleanup;
- 
-    /* Remove non-migratable features by default */
-     updated->type = VIR_CPU_TYPE_GUEST;
-     updated->mode = VIR_CPU_MODE_CUSTOM;
-    if (virCPUDefCopyModelFilter(updated, host, true,
-                                 x86FeatureIsMigratable, map) < 0)
-+    if (virCPUDefCopyModel(updated, host, true) < 0)
-         goto cleanup;
- 
-     if (guest->vendor_id) {
-@@ -2627,7 +2624,7 @@ virCPUx86Update(virCPUDefPtr guest,
- 
-     if (guest->mode == VIR_CPU_MODE_HOST_MODEL ||
-         guest->match == VIR_CPU_MATCH_MINIMUM)
-        ret = x86UpdateHostModel(guest, host, map);
-+        ret = x86UpdateHostModel(guest, host);
-     else
-         ret = 0;
- 
@@ -0,0 +1,94 @@
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 9 Apr 2019 12:35:52 +0200
+Subject: [PATCH] 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, CVE-2019-11091
+
+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:
+        tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
+        tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
+            - test data missing downstream
+
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+---
+ src/cpu_map/x86_features.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_map/x86_features.xml b/src/cpu_map/x86_features.xml
+index 02431bea29..11479f0433 100644
+--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
+@@ -317,6 +317,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='pconfig'>
+     <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00040000'/>
+   </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 70a0fc3286..867970d2c7 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,6 +20,7 @@
+   <feature policy='require' name='tsc_adjust'/>
+   <feature policy='require' name='clflushopt'/>
+   <feature policy='require' name='intel-pt'/>
+  <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 bbdfb6aa61..e7ced42797 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,6 +21,7 @@
+   <feature name='tsc_adjust'/>
+   <feature name='clflushopt'/>
+   <feature name='intel-pt'/>
+  <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'/>
@@ -0,0 +1,54 @@
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Tue, 30 Apr 2019 17:26:13 +0100
+Subject: [PATCH] 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 85e693d76c..6e3b99f97d 100644
+--- a/src/admin/admin_server_dispatch.c
+++ b/src/admin/admin_server_dispatch.c
+@@ -64,6 +64,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;
@@ -1,74 +0,0 @@
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Tue, 11 Apr 2017 20:45:07 +0200
-Subject: [PATCH] cpu: Introduce virCPUGetHostIsSupported
-
-Sometimes we want to call virCPUGetHost only when it is implemented for
-a given architecture to avoid logging expected and possibly misleading
-errors. The new virCPUGetHostIsSupported API may be used to guard such
-calls to virCPUGetHost.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit bf1a881715c905c67f7d38dcd5bd6c2afbff1f9b)
---
- src/cpu/cpu.c            | 20 ++++++++++++++++++++
- src/cpu/cpu.h            |  3 +++
- src/libvirt_private.syms |  1 +
- 3 files changed, 24 insertions(+)
-
-diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
-index 8a407ac18..702b14dbb 100644
--- a/src/cpu/cpu.c
-+++ b/src/cpu/cpu.c
-@@ -357,6 +357,26 @@ virCPUDataFree(virCPUDataPtr data)
- }
- 
- 
-+/**
-+ * virCPUGetHostIsSupported:
-+ *
-+ * @arch: CPU architecture
-+ *
-+ * Check whether virCPUGetHost is supported for @arch.
-+ *
-+ * Returns true if virCPUGetHost is supported, false otherwise.
-+ */
-+bool
-+virCPUGetHostIsSupported(virArch arch)
-+{
-+    struct cpuArchDriver *driver;
-+
-+    VIR_DEBUG("arch=%s", virArchToString(arch));
-+
-+    return (driver = cpuGetSubDriver(arch)) && driver->getHost;
-+}
-+
-+
- /**
-  * virCPUGetHost:
-  *
-diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
-index 352445c40..c6ca111e9 100644
--- a/src/cpu/cpu.h
-+++ b/src/cpu/cpu.h
-@@ -183,6 +183,9 @@ virCPUDataNew(virArch arch);
- void
- virCPUDataFree(virCPUDataPtr data);
- 
-+bool
-+virCPUGetHostIsSupported(virArch arch);
-+
- virCPUDefPtr
- virCPUGetHost(virArch arch,
-               virCPUType type,
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index dc6db3b28..2d8a9ddec 100644
--- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1024,6 +1024,7 @@ virCPUDataNew;
- virCPUDataParse;
- virCPUExpandFeatures;
- virCPUGetHost;
-+virCPUGetHostIsSupported;
- virCPUGetModels;
- virCPUProbeHost;
- virCPUTranslate;
@@ -0,0 +1,47 @@
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Tue, 30 Apr 2019 16:51:37 +0100
+Subject: [PATCH] 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
@@ -1,164 +0,0 @@
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Tue, 11 Apr 2017 20:46:05 +0200
-Subject: [PATCH] qemu: Use more data for comparing CPUs
-
-With QEMU older than 2.9.0 libvirt uses CPUID instruction to determine
-what CPU features are supported on the host. This was later used when
-checking compatibility of guest CPUs. Since QEMU 2.9.0 we ask QEMU for
-the host CPU data. But the two methods we use usually provide disjoint
-sets of CPU features because QEMU/KVM does not support all features
-provided by the host CPU and on the other hand it can enable some
-feature even if the host CPU does not support them.
-
-So if there is a domain which requires a CPU features disabled by
-QEMU/KVM, libvirt will refuse to start it with QEMU > 2.9.0 as its guest
-CPU is incompatible with the host CPU data we got from QEMU. But such
-domain would happily start on older QEMU (of course, the features would
-be missing the guest CPU). To fix this regression, we need to combine
-both CPU feature sets when checking guest CPU compatibility.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1439933
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 5b4a6adb5ca24a6cb91cdc55c31506fb278d3a91)
---
- src/qemu/qemu_capabilities.c | 35 +++++++++++++++++++++++++++++++++--
- src/qemu/qemu_capabilities.h |  4 ++++
- src/qemu/qemu_process.c      |  2 +-
- 3 files changed, 38 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 7fc577546..01bd4750c 100644
--- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -386,6 +386,10 @@ struct _virQEMUCapsHostCPUData {
-     virCPUDefPtr reported;
-     /* Migratable host CPU definition used for updating guest CPU. */
-     virCPUDefPtr migratable;
-+    /* CPU definition with features detected by libvirt using virCPUGetHost
-+     * combined with features reported by QEMU. This is used for backward
-+     * compatible comparison between a guest CPU and a host CPU. */
-+    virCPUDefPtr full;
- };
- 
- /*
-@@ -2106,6 +2110,10 @@ virQEMUCapsHostCPUDataCopy(virQEMUCapsHostCPUDataPtr dst,
-         !(dst->migratable = virCPUDefCopy(src->migratable)))
-         return -1;
- 
-+    if (src->full &&
-+        !(dst->full = virCPUDefCopy(src->full)))
-+        return -1;
-+
-     return 0;
- }
- 
-@@ -2116,6 +2124,7 @@ virQEMUCapsHostCPUDataClear(virQEMUCapsHostCPUDataPtr cpuData)
-     qemuMonitorCPUModelInfoFree(cpuData->info);
-     virCPUDefFree(cpuData->reported);
-     virCPUDefFree(cpuData->migratable);
-+    virCPUDefFree(cpuData->full);
- 
-     memset(cpuData, 0, sizeof(*cpuData));
- }
-@@ -2457,6 +2466,11 @@ virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps,
- 
-     case VIR_QEMU_CAPS_HOST_CPU_MIGRATABLE:
-         return cpuData->migratable;
-+
-+    case VIR_QEMU_CAPS_HOST_CPU_FULL:
-+        /* 'full' is non-NULL only if we have data from both QEMU and
-+         * virCPUGetHost */
-+        return cpuData->full ? cpuData->full : cpuData->reported;
-     }
- 
-     return NULL;
-@@ -2467,12 +2481,14 @@ static void
- virQEMUCapsSetHostModel(virQEMUCapsPtr qemuCaps,
-                         virDomainVirtType type,
-                         virCPUDefPtr reported,
-                        virCPUDefPtr migratable)
-+                        virCPUDefPtr migratable,
-+                        virCPUDefPtr full)
- {
-     virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type);
- 
-     cpuData->reported = reported;
-     cpuData->migratable = migratable;
-+    cpuData->full = full;
- }
- 
- 
-@@ -3344,6 +3360,8 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
-     virCPUDefPtr cpu = NULL;
-     virCPUDefPtr migCPU = NULL;
-     virCPUDefPtr hostCPU = NULL;
-+    virCPUDefPtr fullCPU = NULL;
-+    size_t i;
-     int rc;
- 
-     if (!caps || !virQEMUCapsGuestIsNative(caps->host.arch, qemuCaps->arch))
-@@ -3363,6 +3381,18 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
-                                      virQEMUCapsCPUFilterFeatures,
-                                      qemuCaps) < 0)
-             goto error;
-+    } else if (type == VIR_DOMAIN_VIRT_KVM &&
-+               virCPUGetHostIsSupported(qemuCaps->arch)) {
-+        if (!(fullCPU = virCPUGetHost(qemuCaps->arch, VIR_CPU_TYPE_GUEST,
-+                                      NULL, NULL, 0)))
-+            goto error;
-+
-+        for (i = 0; i < cpu->nfeatures; i++) {
-+            if (cpu->features[i].policy == VIR_CPU_FEATURE_REQUIRE &&
-+                virCPUDefUpdateFeature(fullCPU, cpu->features[i].name,
-+                                       VIR_CPU_FEATURE_REQUIRE) < 0)
-+                goto error;
-+        }
-     }
- 
-     if (!(migCPU = virQEMUCapsNewHostCPUModel()))
-@@ -3378,7 +3408,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
-             goto error;
-     }
- 
-    virQEMUCapsSetHostModel(qemuCaps, type, cpu, migCPU);
-+    virQEMUCapsSetHostModel(qemuCaps, type, cpu, migCPU, fullCPU);
- 
-  cleanup:
-     virCPUDefFree(hostCPU);
-@@ -3387,6 +3417,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
-  error:
-     virCPUDefFree(cpu);
-     virCPUDefFree(migCPU);
-+    virCPUDefFree(fullCPU);
-     virResetLastError();
-     goto cleanup;
- }
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 31818c940..4e9561c0a 100644
--- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -455,6 +455,10 @@ typedef enum {
-     VIR_QEMU_CAPS_HOST_CPU_REPORTED,
-     /* Migratable host CPU definition used for updating guest CPU. */
-     VIR_QEMU_CAPS_HOST_CPU_MIGRATABLE,
-+    /* CPU definition with features detected by libvirt using virCPUGetHost
-+     * combined with features reported by QEMU. This is used for backward
-+     * compatible comparison between a guest CPU and a host CPU. */
-+    VIR_QEMU_CAPS_HOST_CPU_FULL,
- } virQEMUCapsHostCPUType;
- 
- virCPUDefPtr virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps,
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index e67736638..992a7174b 100644
--- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -5300,7 +5300,7 @@ qemuProcessUpdateGuestCPU(virDomainDefPtr def,
-     if (def->cpu->check == VIR_CPU_CHECK_PARTIAL &&
-         virCPUCompare(caps->host.arch,
-                       virQEMUCapsGetHostModel(qemuCaps, def->virtType,
-                                              VIR_QEMU_CAPS_HOST_CPU_REPORTED),
-+                                              VIR_QEMU_CAPS_HOST_CPU_FULL),
-                       def->cpu, true) < 0)
-         return -1;
- 
@@ -0,0 +1,47 @@
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Tue, 30 Apr 2019 17:27:41 +0100
+Subject: [PATCH] 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
@@ -0,0 +1,81 @@
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Fri, 14 Jun 2019 08:47:42 +0200
+Subject: [PATCH] api: disallow virDomainSaveImageGetXMLDesc on read-only
+ connections
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The virDomainSaveImageGetXMLDesc API is taking a path parameter,
+which can point to any path on the system. This file will then be
+read and parsed by libvirtd running with root privileges.
+
+Forbid it on read-only connections.
+
+Fixes: CVE-2019-10161
+Reported-by: Matthias Gerstner <mgerstner@suse.de>
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit aed6a032cead4386472afb24b16196579e239580)
+---
+ src/libvirt-domain.c         | 11 ++---------
+ src/qemu/qemu_driver.c       |  2 +-
+ src/remote/remote_protocol.x |  3 +--
+ 3 files changed, 4 insertions(+), 12 deletions(-)
+
+diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
+index 072b92b717..ba0aaccdc1 100644
+--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
+@@ -1073,8 +1073,7 @@ virDomainRestoreFlags(virConnectPtr conn, const char *from, const char *dxml,
+  * previously by virDomainSave() or virDomainSaveFlags().
+  *
+  * No security-sensitive data will be included unless @flags contains
+- * VIR_DOMAIN_SAVE_IMAGE_XML_SECURE; this flag is rejected on read-only
+- * connections.
+ * VIR_DOMAIN_SAVE_IMAGE_XML_SECURE.
+  *
+  * Returns a 0 terminated UTF-8 encoded XML instance, or NULL in case of
+  * error.  The caller must free() the returned value.
+@@ -1090,13 +1089,7 @@ virDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *file,
+ 
+     virCheckConnectReturn(conn, NULL);
+     virCheckNonNullArgGoto(file, error);
+-
+-    if ((conn->flags & VIR_CONNECT_RO) &&
+-        (flags & VIR_DOMAIN_SAVE_IMAGE_XML_SECURE)) {
+-        virReportError(VIR_ERR_OPERATION_DENIED, "%s",
+-                       _("virDomainSaveImageGetXMLDesc with secure flag"));
+-        goto error;
+-    }
+    virCheckReadOnlyGoto(conn->flags, error);
+ 
+     if (conn->driver->domainSaveImageGetXMLDesc) {
+         char *ret;
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 75d31efd14..b4a52f87a9 100644
+--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
+@@ -7083,7 +7083,7 @@ qemuDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *path,
+     if (fd < 0)
+         goto cleanup;
+ 
+-    if (virDomainSaveImageGetXMLDescEnsureACL(conn, def, flags) < 0)
+    if (virDomainSaveImageGetXMLDescEnsureACL(conn, def) < 0)
+         goto cleanup;
+ 
+     ret = qemuDomainDefFormatXML(driver, def, flags);
+diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
+index 60cc40e04a..a67aba6131 100644
+--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
+@@ -5234,8 +5234,7 @@ enum remote_procedure {
+     /**
+      * @generate: both
+      * @priority: high
+-     * @acl: domain:read
+-     * @acl: domain:read_secure:VIR_DOMAIN_SAVE_IMAGE_XML_SECURE
+     * @acl: domain:write
+      */
+     REMOTE_PROC_DOMAIN_SAVE_IMAGE_GET_XML_DESC = 235,
+ 
@@ -0,0 +1,33 @@
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Fri, 14 Jun 2019 09:14:53 +0200
+Subject: [PATCH] api: disallow virDomainManagedSaveDefineXML on read-only
+ connections
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The virDomainManagedSaveDefineXML can be used to alter the domain's
+config used for managedsave or even execute arbitrary emulator binaries.
+Forbid it on read-only connections.
+
+Fixes: CVE-2019-10166
+Reported-by: Matthias Gerstner <mgerstner@suse.de>
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit db0b78457f183e4c7ac45bc94de86044a1e2056a)
+---
+ src/libvirt-domain.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
+index ba0aaccdc1..ac7c4708b9 100644
+--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
+@@ -9565,6 +9565,7 @@ virDomainManagedSaveDefineXML(virDomainPtr domain, const char *dxml,
+ 
+     virCheckDomainReturn(domain, -1);
+     conn = domain->conn;
+    virCheckReadOnlyGoto(conn->flags, error);
+ 
+     if (conn->driver->domainManagedSaveDefineXML) {
+         int ret;
@@ -0,0 +1,31 @@
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Fri, 14 Jun 2019 09:16:14 +0200
+Subject: [PATCH] api: disallow virConnectGetDomainCapabilities on read-only
+ connections
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This API can be used to execute arbitrary emulators.
+Forbid it on read-only connections.
+
+Fixes: CVE-2019-10167
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 8afa68bac0cf99d1f8aaa6566685c43c22622f26)
+---
+ src/libvirt-domain.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
+index ac7c4708b9..f7b834dfa6 100644
+--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
+@@ -11360,6 +11360,7 @@ virConnectGetDomainCapabilities(virConnectPtr conn,
+     virResetLastError();
+ 
+     virCheckConnectReturn(conn, NULL);
+    virCheckReadOnlyGoto(conn->flags, error);
+ 
+     if (conn->driver->connectGetDomainCapabilities) {
+         char *ret;
@@ -0,0 +1,39 @@
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Fri, 14 Jun 2019 09:17:39 +0200
+Subject: [PATCH] api: disallow virConnect*HypervisorCPU on read-only
+ connections
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+These APIs can be used to execute arbitrary emulators.
+Forbid them on read-only connections.
+
+Fixes: CVE-2019-10168
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit bf6c2830b6c338b1f5699b095df36f374777b291)
+---
+ src/libvirt-host.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/libvirt-host.c b/src/libvirt-host.c
+index e20d6ee250..2978825d22 100644
+--- a/src/libvirt-host.c
+++ b/src/libvirt-host.c
+@@ -1041,6 +1041,7 @@ virConnectCompareHypervisorCPU(virConnectPtr conn,
+ 
+     virCheckConnectReturn(conn, VIR_CPU_COMPARE_ERROR);
+     virCheckNonNullArgGoto(xmlCPU, error);
+    virCheckReadOnlyGoto(conn->flags, error);
+ 
+     if (conn->driver->connectCompareHypervisorCPU) {
+         int ret;
+@@ -1234,6 +1235,7 @@ virConnectBaselineHypervisorCPU(virConnectPtr conn,
+ 
+     virCheckConnectReturn(conn, NULL);
+     virCheckNonNullArgGoto(xmlCPUs, error);
+    virCheckReadOnlyGoto(conn->flags, error);
+ 
+     if (conn->driver->connectBaselineHypervisorCPU) {
+         char *cpu;
@@ -0,0 +1,32 @@
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Wed, 27 Mar 2019 10:59:58 +0000
+Subject: [PATCH] api: disallow virDomainGetHostname for read-only connections
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The virDomainGetHostname API is fetching guest information and this may
+involve use of an untrusted guest agent. As such its use must be
+forbidden on a read-only connection to libvirt.
+
+Fixes CVE-2019-3886
+Reviewed-by: Jim Fehlig <jfehlig@suse.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 2a07c990bd9143d7a0fe8d1b6b7c763c52185240)
+---
+ src/libvirt-domain.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
+index f7b834dfa6..c9bff31af5 100644
+--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
+@@ -11025,6 +11025,8 @@ virDomainGetHostname(virDomainPtr domain, unsigned int flags)
+     virCheckDomainReturn(domain, NULL);
+     conn = domain->conn;
+ 
+    virCheckReadOnlyGoto(domain->conn->flags, error);
+
+     if (conn->driver->domainGetHostname) {
+         char *ret;
+         ret = conn->driver->domainGetHostname(domain, flags);
@@ -0,0 +1,42 @@
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Wed, 27 Mar 2019 11:22:49 +0000
+Subject: [PATCH] remote: enforce ACL write permission for getting guest time &
+ hostname
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Getting the guest time and hostname both require use of guest agent
+commands. These must not be allowed for read-only users, so the
+permissions check must validate "write" permission not "read".
+
+Fixes CVE-2019-3886
+Reviewed-by: Jim Fehlig <jfehlig@suse.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit ae076bb40e0e150aef41361b64001138d04d6c60)
+---
+ src/remote/remote_protocol.x | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
+index a67aba6131..ff9e34a852 100644
+--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
+@@ -5504,7 +5504,7 @@ enum remote_procedure {
+ 
+     /**
+      * @generate: both
+-     * @acl: domain:read
+     * @acl: domain:write
+      */
+     REMOTE_PROC_DOMAIN_GET_HOSTNAME = 277,
+ 
+@@ -5899,7 +5899,7 @@ enum remote_procedure {
+ 
+     /**
+      * @generate: none
+-     * @acl: domain:read
+     * @acl: domain:write
+      */
+     REMOTE_PROC_DOMAIN_GET_TIME = 337,
+ 
@@ -0,0 +1,59 @@
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Wed, 10 Apr 2019 17:14:25 +0200
+Subject: [PATCH] qemu: Set up EMULATOR thread and cpuset.mems before
+ exec()-ing qemu
+
+It's funny how this went unnoticed for such a long time. Long
+story short, if a domain is configured with
+VIR_DOMAIN_NUMATUNE_MEM_STRICT libvirt doesn't really honour
+that. This is because of 7e72ac787848 after which libvirt allowed
+qemu to allocate memory just anywhere and only after that it used
+some magic involving cpuset.memory_migrate and cpuset.mems to
+move the memory to desired NUMA nodes. This was done in order to
+work around some KVM bug where KVM would fail if there wasn't a
+DMA zone available on the NUMA node. Well, while the work around
+might stopped libvirt tickling the KVM bug it also caused a bug
+on libvirt side: if there is not enough memory on configured NUMA
+node(s) then any attempt to start a domain must fail. Because of
+the way we play with guest memory domains can start just happily.
+
+The solution is to move the child we've just forked into emulator
+cgroup, set up cpuset.mems and exec() qemu only after that.
+
+This basically reverts 7e72ac787848b7434c9 which was a workaround
+for kernel bug. This bug was apparently fixed because I've tested
+this successfully with recent kernel.
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
+(cherry picked from commit 0eaa4716e1b8f6eb59d77049aed3735c3b5fbdd6)
+---
+ src/qemu/qemu_process.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index 68c670d3f2..3bcc2ebd71 100644
+--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
+@@ -6636,6 +6636,10 @@ qemuProcessLaunch(virConnectPtr conn,
+     if (qemuProcessInitCpuAffinity(vm) < 0)
+         goto cleanup;
+ 
+    VIR_DEBUG("Setting emulator tuning/settings");
+    if (qemuProcessSetupEmulator(vm) < 0)
+        goto cleanup;
+
+     VIR_DEBUG("Setting cgroup for external devices (if required)");
+     if (qemuSetupCgroupForExtDevices(vm, driver) < 0)
+         goto cleanup;
+@@ -6727,10 +6731,6 @@ qemuProcessLaunch(virConnectPtr conn,
+     if (qemuProcessDetectIOThreadPIDs(driver, vm, asyncJob) < 0)
+         goto cleanup;
+ 
+-    VIR_DEBUG("Setting emulator tuning/settings");
+-    if (qemuProcessSetupEmulator(vm) < 0)
+-        goto cleanup;
+-
+     VIR_DEBUG("Setting global CPU cgroup (if required)");
+     if (qemuSetupGlobalCpuCgroup(vm) < 0)
+         goto cleanup;
@@ -0,0 +1,35 @@
+From: Peter Krempa <pkrempa@redhat.com>
+Date: Fri, 17 May 2019 10:15:53 +0200
+Subject: [PATCH] qemu: blockjob: Fix saving of inactive XML after completed
+ legacy blockjob
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit c257352797 introduced a logic bug where we will never save the
+inactive XML after a blockjob as the variable which was determining
+whether to do so is cleared right before. Thus even if we correctly
+modify the inactive state it will be rolled back when libvirtd is
+restarted.
+
+Reported-by: Thomas Stein <hello@himbee.re>
+Signed-off-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit 4d8cc5a07a0dcc0ac99377f66a4649d219705452)
+---
+ src/qemu/qemu_blockjob.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
+index fa7e4c8625..f105632a09 100644
+--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
+@@ -363,7 +363,7 @@ qemuBlockJobEventProcessLegacy(virQEMUDriverPtr driver,
+     if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0)
+         VIR_WARN("Unable to save status on vm %s after block job", vm->def->name);
+ 
+-    if (job->newstate == VIR_DOMAIN_BLOCK_JOB_COMPLETED && vm->newDef) {
+    if (job->state == VIR_DOMAIN_BLOCK_JOB_COMPLETED && vm->newDef) {
+         if (virDomainSaveConfig(cfg->configDir, driver->caps, vm->newDef) < 0)
+             VIR_WARN("Unable to update persistent definition on vm %s "
+                      "after block job", vm->def->name);
@@ -1,123 +0,0 @@
-From: Neal Gompa <ngompa13@gmail.com>
-Date: Mon, 17 Jul 2017 11:32:46 -0400
-Subject: [PATCH] spec: Add support for building the zfs storage driver
-
-Where it can be supported in Fedora, the driver is built and made
-available as a subpackage.
-
-Signed-off-by: Neal Gompa <ngompa13@gmail.com>
-(cherry picked from commit 9af764e86aef7dfb0191a9561bf1d1abf941da05)
---
- libvirt.spec.in | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 49 insertions(+), 1 deletion(-)
-
-diff --git a/libvirt.spec.in b/libvirt.spec.in
-index 079b5f386..46a3e97d1 100644
--- a/libvirt.spec.in
-+++ b/libvirt.spec.in
-@@ -71,6 +71,13 @@
- %define with_storage_gluster 0%{!?_without_storage_gluster:1}
- %define with_numactl          0%{!?_without_numactl:1}
- 
-+# F25+ has zfs-fuse
-+%if 0%{?fedora} >= 25
-+    %define with_storage_zfs      0%{!?_without_storage_zfs:1}
-+%else
-+    %define with_storage_zfs      0
-+%endif
-+
- # A few optional bits off by default, we enable later
- %define with_fuse          0%{!?_without_fuse:0}
- %define with_cgconfig      0%{!?_without_cgconfig:0}
-@@ -115,6 +122,12 @@
-     %endif
- %endif
- 
-+# zfs-fuse is not available on some architectures
-+%ifarch s390 s390x aarch64
-+    %define with_storage_zfs 0
-+%endif
-+
-+
- # RHEL doesn't ship OpenVZ, VBox, UML, PowerHypervisor,
- # VMware, libxenserver (xenapi), libxenlight (Xen 4.1 and newer),
- # or HyperV.
-@@ -373,6 +386,12 @@ BuildRequires: glusterfs-devel >= 3.4.1
- %if %{with_storage_sheepdog}
- BuildRequires: sheepdog
- %endif
-+%if %{with_storage_zfs}
-+# Support any conforming implementation of zfs. On stock Fedora
-+# this is zfs-fuse, but could be zfsonlinux upstream RPMs
-+BuildRequires: /sbin/zfs
-+BuildRequires: /sbin/zpool
-+%endif
- %if %{with_numactl}
- # For QEMU/LXC numa info
- BuildRequires: numactl-devel
-@@ -705,6 +724,21 @@ sheepdog volumes using.
- %endif
- 
- 
-+%if %{with_storage_zfs}
-+%package daemon-driver-storage-zfs
-+Summary: Storage driver plugin for ZFS
-+Group: Development/Libraries
-+Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
-+# Support any conforming implementation of zfs
-+Requires: /sbin/zfs
-+Requires: /sbin/zpool
-+
-+%description daemon-driver-storage-zfs
-+The storage driver backend adding implementation of the storage APIs for
-+ZFS volumes.
-+%endif
-+
-+
- %package daemon-driver-storage
- Summary: Storage driver plugin including all backends for the libvirtd daemon
- Group: Development/Libraries
-@@ -723,6 +757,9 @@ Requires: libvirt-daemon-driver-storage-rbd = %{version}-%{release}
- %if %{with_storage_sheepdog}
- Requires: libvirt-daemon-driver-storage-sheepdog = %{version}-%{release}
- %endif
-+%if %{with_storage_zfs}
-+Requires: libvirt-daemon-driver-storage-zfs = %{version}-%{release}
-+%endif
- 
- %description daemon-driver-storage
- The storage driver plugin for the libvirtd daemon, providing
-@@ -1180,6 +1217,12 @@ rm -rf .git
-     %define arg_storage_gluster --without-storage-gluster
- %endif
- 
-+%if %{with_storage_zfs}
-+    %define arg_storage_zfs --with-storage-zfs
-+%else
-+    %define arg_storage_zfs --without-storage-zfs
-+%endif
-+
- %if %{with_numactl}
-     %define arg_numactl --with-numactl
- %else
-@@ -1288,7 +1331,7 @@ rm -f po/stamp-po
-            %{?arg_storage_rbd} \
-            %{?arg_storage_sheepdog} \
-            %{?arg_storage_gluster} \
-           --without-storage-zfs \
-+           %{?arg_storage_zfs} \
-            --without-storage-vstorage \
-            %{?arg_numactl} \
-            %{?arg_numad} \
-@@ -1850,6 +1893,11 @@ exit 0
- %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_sheepdog.so
- %endif
- 
-+%if %{with_storage_zfs}
-+%files daemon-driver-storage-zfs
-+%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_zfs.so
-+%endif
-+
- %if %{with_qemu}
- %files daemon-driver-qemu
- %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
@@ -1,150 +0,0 @@
-From: Juan Hernandez <jhernand@redhat.com>
-Date: Thu, 6 Jul 2017 17:03:31 +0200
-Subject: [PATCH] Avoid hidden cgroup mount points
-
-Currently the scan of the /proc/mounts file used to find cgroup mount
-points doesn't take into account that mount points may hidden by other
-mount points. For, example in certain Kubernetes environments the
-/proc/mounts contains the following lines:
-
-  cgroup /sys/fs/cgroup/net_prio,net_cls cgroup ...
-  tmpfs /sys/fs/cgroup tmpfs ...
-  cgroup /sys/fs/cgroup/net_cls,net_prio cgroup ...
-
-In this particular environment the first mount point is hidden by the
-second one. The correct mount point is the third one, but libvirt will
-never process it because it only checks the first mount point for each
-controller (net_cls in this case). So libvirt will try to use the first
-mount point, which doesn't actually exist, and the complete detection
-process will fail.
-
-To avoid that issue this patch changes the virCgroupDetectMountsFromFile
-function so that when there are duplicates it takes the information from
-the last line in /proc/mounts. This requires removing the previous
-explicit condition to skip duplicates, and adding code to free the
-memory used by the processing of duplicated lines.
-
-Related-To: https://bugzilla.redhat.com/1468214
-Related-To: https://github.com/kubevirt/libvirt/issues/4
-Signed-off-by: Juan Hernandez <jhernand@redhat.com>
-(cherry picked from commit dacd160d7479e0ec2d8a63f102145fd30636a1c8)
---
- src/util/vircgroup.c                | 23 ++++++++++++++---------
- tests/vircgroupdata/kubevirt.mounts | 25 +++++++++++++++++++++++++
- tests/vircgroupdata/kubevirt.parsed | 10 ++++++++++
- tests/vircgrouptest.c               |  1 +
- 4 files changed, 50 insertions(+), 9 deletions(-)
- create mode 100644 tests/vircgroupdata/kubevirt.mounts
- create mode 100644 tests/vircgroupdata/kubevirt.parsed
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 5aa1db5b1..a53908fc9 100644
--- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -397,6 +397,7 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
-             const char *typestr = virCgroupControllerTypeToString(i);
-             int typelen = strlen(typestr);
-             char *tmp = entry.mnt_opts;
-+            struct virCgroupController *controller = &group->controllers[i];
-             while (tmp) {
-                 char *next = strchr(tmp, ',');
-                 int len;
-@@ -406,18 +407,22 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
-                 } else {
-                     len = strlen(tmp);
-                 }
-                /* NB, the same controller can appear >1 time in mount list
-                 * due to bind mounts from one location to another. Pick the
-                 * first entry only
-                 */
-                if (typelen == len && STREQLEN(typestr, tmp, len) &&
-                    !group->controllers[i].mountPoint) {
-+
-+                if (typelen == len && STREQLEN(typestr, tmp, len)) {
-                     char *linksrc;
-                     struct stat sb;
-                     char *tmp2;
- 
-                    if (VIR_STRDUP(group->controllers[i].mountPoint,
-                                   entry.mnt_dir) < 0)
-+                    /* Note that the lines in /proc/mounts have the same
-+                     * order than the mount operations, and that there may
-+                     * be duplicates due to bind mounts. This means
-+                     * that the same mount point may be processed more than
-+                     * once. We need to save the results of the last one,
-+                     * and we need to be careful to release the memory used
-+                     * by previous processing. */
-+                    VIR_FREE(controller->mountPoint);
-+                    VIR_FREE(controller->linkPoint);
-+                    if (VIR_STRDUP(controller->mountPoint, entry.mnt_dir) < 0)
-                         goto error;
- 
-                     tmp2 = strrchr(entry.mnt_dir, '/');
-@@ -453,7 +458,7 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
-                                 VIR_WARN("Expecting a symlink at %s for controller %s",
-                                          linksrc, typestr);
-                             } else {
-                                group->controllers[i].linkPoint = linksrc;
-+                                controller->linkPoint = linksrc;
-                             }
-                         }
-                     }
-diff --git a/tests/vircgroupdata/kubevirt.mounts b/tests/vircgroupdata/kubevirt.mounts
-new file mode 100644
-index 000000000..ca036196b
--- /dev/null
-+++ b/tests/vircgroupdata/kubevirt.mounts
-@@ -0,0 +1,25 @@
-+rootfs / rootfs rw 0 0
-+proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0
-+udev /dev devtmpfs rw,nosuid,relatime,size=10240k,nr_inodes=1006404,mode=755 0 0
-+devpts /dev/pts devpts rw,relatime,gid=5,mode=620,ptmxmode=000 0 0
-+sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0
-+/dev/sda1 / ext4 rw,noatime,data=ordered 0 0
-+tmpfs /run tmpfs rw,nodev,relatime,size=812296k,mode=755 0 0
-+mqueue /dev/mqueue mqueue rw,nosuid,nodev,noexec,relatime 0 0
-+shm /dev/shm tmpfs rw,nosuid,nodev,noexec,relatime 0 0
-+debugfs /sys/kernel/debug debugfs rw,nosuid,nodev,noexec,relatime 0 0
-+cgroup_root /sys/fs/cgroup tmpfs rw,nosuid,nodev,noexec,relatime,size=10240k,mode=755 0 0
-+openrc /sys/fs/cgroup/openrc cgroup rw,nosuid,nodev,noexec,relatime,release_agent=/lib64/rc/sh/cgroup-release-agent.sh,name=openrc 0 0
-+cpuset /some/random/location/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0
-+cpuset /sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0
-+cpu /sys/fs/cgroup/cpu cgroup rw,nosuid,nodev,noexec,relatime,cpu 0 0
-+cpuacct /some/random/location/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuacct 0 0
-+cpuacct /sys/fs/cgroup/cpuacct cgroup rw,nosuid,nodev,noexec,relatime,cpuacct 0 0
-+memory /sys/fs/cgroup/memory cgroup rw,nosuid,nodev,noexec,relatime,memory 0 0
-+devices /sys/fs/cgroup/devices cgroup rw,nosuid,nodev,noexec,relatime,devices 0 0
-+freezer /sys/fs/cgroup/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0
-+blkio /sys/fs/cgroup/blkio cgroup rw,nosuid,nodev,noexec,relatime,blkio 0 0
-+perf_event /sys/fs/cgroup/perf_event cgroup rw,nosuid,nodev,noexec,relatime,perf_event 0 0
-+hugetlb /sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 0
-+binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc rw,nosuid,nodev,noexec,relatime 0 0
-+freezer /some/random/location/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0
-diff --git a/tests/vircgroupdata/kubevirt.parsed b/tests/vircgroupdata/kubevirt.parsed
-new file mode 100644
-index 000000000..694870723
--- /dev/null
-+++ b/tests/vircgroupdata/kubevirt.parsed
-@@ -0,0 +1,10 @@
-+cpu          /sys/fs/cgroup/cpu
-+cpuacct      /sys/fs/cgroup/cpuacct
-+cpuset       /sys/fs/cgroup/cpuset
-+memory       /sys/fs/cgroup/memory
-+devices      /sys/fs/cgroup/devices
-+freezer      /some/random/location/freezer
-+blkio        /sys/fs/cgroup/blkio
-+net_cls      <null>
-+perf_event   /sys/fs/cgroup/perf_event
-+name=systemd <null>
-diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
-index f55ef74a1..cf0315f16 100644
--- a/tests/vircgrouptest.c
-+++ b/tests/vircgrouptest.c
-@@ -885,6 +885,7 @@ mymain(void)
-     DETECT_MOUNTS("cgroups3");
-     DETECT_MOUNTS("all-in-one");
-     DETECT_MOUNTS("no-cgroups");
-+    DETECT_MOUNTS("kubevirt");
- 
-     if (virTestRun("New cgroup for self", testCgroupNewForSelf, NULL) < 0)
-         ret = -1;
@@ -1,53 +0,0 @@
-From: Jim Fehlig <jfehlig@suse.com>
-Date: Tue, 18 Jul 2017 10:20:35 -0600
-Subject: [PATCH] docs: schema: make disk driver name attribute optional
-
-/domain/devices/disk/driver/@name is not a required or mandatory
-attribute according to formatdomain, and indeed it was agreed on
-IRC that the attribute is "optional for input, recommended (but
-not required) for output". Currently the schema requires the
-attribute, causing virt-xml-validate to fail on disk config where
-the driver name is not explicitly specified. E.g.
-
-# cat test.xml | grep -A 5 cdrom
-    <disk type='file' device='cdrom'>
-      <driver type='raw'/>
-      <target dev='hdb' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
-    </disk>
-
-# virt-xml-validate test.xml
-Relax-NG validity error : Extra element devices in interleave
-test.xml:21: element devices: Relax-NG validity error : Element domain failed to validate content
-test.xml fails to validate
-
-Relaxing the name attribute to be optional fixes the validation
-
-# virt-xml-validate test.xml
-test.xml validates
-
-(cherry picked from commit b494e09d058f09b48d0fd8855edd557101294671)
---
- docs/schemas/domaincommon.rng | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
-index edc225fe5..dfc7e2470 100644
--- a/docs/schemas/domaincommon.rng
-+++ b/docs/schemas/domaincommon.rng
-@@ -1720,9 +1720,11 @@
-     </element>
-   </define>
-   <define name="driverFormat">
-    <attribute name="name">
-      <ref name="genericName"/>
-    </attribute>
-+    <optional>
-+      <attribute name="name">
-+        <ref name="genericName"/>
-+      </attribute>
-+    </optional>
-     <optional>
-       <attribute name='type'>
-         <choice>
@@ -1,34 +0,0 @@
-From: Stefan Berger <stefanb@linux.vnet.ibm.com>
-Date: Thu, 29 Jun 2017 14:01:11 -0400
-Subject: [PATCH] tpm: Use /dev/null for cancel path if none was found
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-TPM 2 does not implement sysfs files for cancellation of commands.
-We therefore use /dev/null for the cancel path passed to QEMU.
-
-Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
-Tested-by: Javier Martinez Canillas <javierm@redhat.com>
-Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit dfbb15b75433e520fb1b905c1c3e28753e53e4a5)
---
- src/util/virtpm.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/util/virtpm.c b/src/util/virtpm.c
-index 6d9b0657a..d5c10da38 100644
--- a/src/util/virtpm.c
-+++ b/src/util/virtpm.c
-@@ -61,9 +61,7 @@ virTPMCreateCancelPath(const char *devpath)
-                 VIR_FREE(path);
-             }
-             if (!path)
-                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                               _("No usable sysfs TPM cancel file could be "
-                                 "found"));
-+                ignore_value(VIR_STRDUP(path, "/dev/null"));
-         } else {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("TPM device path %s is invalid"), devpath);
@@ -1,108 +0,0 @@
-From: Cole Robinson <crobinso@redhat.com>
-Date: Sun, 27 Aug 2017 11:23:47 -0400
-Subject: [PATCH] security: add MANAGER_MOUNT_NAMESPACE flag
-
-The VIR_SECURITY_MANAGER_MOUNT_NAMESPACE flag informs the DAC driver
-if mount namespaces are in use for the VM. Will be used for future
-changes.
-
-Wire it up in the qemu driver
-
-(cherry picked from commit 321031e482425dfeae0f125cdac6df870f079efd)
---
- src/qemu/qemu_driver.c          |  2 ++
- src/security/security_dac.c     | 10 ++++++++++
- src/security/security_dac.h     |  3 +++
- src/security/security_manager.c |  4 +++-
- src/security/security_manager.h |  1 +
- 5 files changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index ce844bb04..555a1009b 100644
--- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -417,6 +417,8 @@ qemuSecurityInit(virQEMUDriverPtr driver)
-     if (virQEMUDriverIsPrivileged(driver)) {
-         if (cfg->dynamicOwnership)
-             flags |= VIR_SECURITY_MANAGER_DYNAMIC_OWNERSHIP;
-+        if (virBitmapIsBitSet(cfg->namespaces, QEMU_DOMAIN_NS_MOUNT))
-+            flags |= VIR_SECURITY_MANAGER_MOUNT_NAMESPACE;
-         if (!(mgr = qemuSecurityNewDAC(QEMU_DRIVER_NAME,
-                                        cfg->user,
-                                        cfg->group,
-diff --git a/src/security/security_dac.c b/src/security/security_dac.c
-index 922e48494..1f8d279bf 100644
--- a/src/security/security_dac.c
-+++ b/src/security/security_dac.c
-@@ -57,6 +57,7 @@ struct _virSecurityDACData {
-     gid_t *groups;
-     int ngroups;
-     bool dynamicOwnership;
-+    bool mountNamespace;
-     char *baselabel;
-     virSecurityManagerDACChownCallback chownCallback;
- };
-@@ -237,6 +238,15 @@ virSecurityDACSetDynamicOwnership(virSecurityManagerPtr mgr,
-     priv->dynamicOwnership = dynamicOwnership;
- }
- 
-+void
-+virSecurityDACSetMountNamespace(virSecurityManagerPtr mgr,
-+                                bool mountNamespace)
-+{
-+    virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
-+    priv->mountNamespace = mountNamespace;
-+}
-+
-+
- void
- virSecurityDACSetChownCallback(virSecurityManagerPtr mgr,
-                                virSecurityManagerDACChownCallback chownCallback)
-diff --git a/src/security/security_dac.h b/src/security/security_dac.h
-index 846cefbb5..97681c961 100644
--- a/src/security/security_dac.h
-+++ b/src/security/security_dac.h
-@@ -32,6 +32,9 @@ int virSecurityDACSetUserAndGroup(virSecurityManagerPtr mgr,
- void virSecurityDACSetDynamicOwnership(virSecurityManagerPtr mgr,
-                                        bool dynamic);
- 
-+void virSecurityDACSetMountNamespace(virSecurityManagerPtr mgr,
-+                                     bool mountNamespace);
-+
- void virSecurityDACSetChownCallback(virSecurityManagerPtr mgr,
-                                     virSecurityManagerDACChownCallback chownCallback);
- 
-diff --git a/src/security/security_manager.c b/src/security/security_manager.c
-index 6c777db1e..b2d04d4b9 100644
--- a/src/security/security_manager.c
-+++ b/src/security/security_manager.c
-@@ -146,7 +146,8 @@ virSecurityManagerNewDAC(const char *virtDriver,
-     virSecurityManagerPtr mgr;
- 
-     virCheckFlags(VIR_SECURITY_MANAGER_NEW_MASK |
-                  VIR_SECURITY_MANAGER_DYNAMIC_OWNERSHIP, NULL);
-+                  VIR_SECURITY_MANAGER_DYNAMIC_OWNERSHIP |
-+                  VIR_SECURITY_MANAGER_MOUNT_NAMESPACE, NULL);
- 
-     mgr = virSecurityManagerNewDriver(&virSecurityDriverDAC,
-                                       virtDriver,
-@@ -161,6 +162,7 @@ virSecurityManagerNewDAC(const char *virtDriver,
-     }
- 
-     virSecurityDACSetDynamicOwnership(mgr, flags & VIR_SECURITY_MANAGER_DYNAMIC_OWNERSHIP);
-+    virSecurityDACSetMountNamespace(mgr, flags & VIR_SECURITY_MANAGER_MOUNT_NAMESPACE);
-     virSecurityDACSetChownCallback(mgr, chownCallback);
- 
-     return mgr;
-diff --git a/src/security/security_manager.h b/src/security/security_manager.h
-index 238e66cd0..96937a892 100644
--- a/src/security/security_manager.h
-+++ b/src/security/security_manager.h
-@@ -36,6 +36,7 @@ typedef enum {
-     VIR_SECURITY_MANAGER_REQUIRE_CONFINED   = 1 << 2,
-     VIR_SECURITY_MANAGER_PRIVILEGED         = 1 << 3,
-     VIR_SECURITY_MANAGER_DYNAMIC_OWNERSHIP  = 1 << 4,
-+    VIR_SECURITY_MANAGER_MOUNT_NAMESPACE    = 1 << 5,
- } virSecurityManagerNewFlags;
- 
- # define VIR_SECURITY_MANAGER_NEW_MASK  \
@@ -1,101 +0,0 @@
-From: Cole Robinson <crobinso@redhat.com>
-Date: Mon, 17 Jul 2017 08:57:57 -0400
-Subject: [PATCH] security: dac: relabel spice rendernode
-
-For a logged in user this a path like /dev/dri/renderD128 will have
-default ownership root:video which won't work for the qemu:qemu user,
-so we need to chown it.
-
-We only do this when mount namespaces are enabled in the qemu driver,
-so the chown'ing doesn't interfere with other users of the shared
-render node path
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1460804
-(cherry picked from commit 98931187eefdec6f2dea5cb82ab6d23a3ffa6634)
---
- src/security/security_dac.c | 58 +++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 58 insertions(+)
-
-diff --git a/src/security/security_dac.c b/src/security/security_dac.c
-index 1f8d279bf..5f13bcee8 100644
--- a/src/security/security_dac.c
-+++ b/src/security/security_dac.c
-@@ -1379,6 +1379,54 @@ virSecurityDACRestoreTPMFileLabel(virSecurityManagerPtr mgr,
- }
- 
- 
-+static int
-+virSecurityDACSetGraphicsLabel(virSecurityManagerPtr mgr,
-+                               virDomainDefPtr def,
-+                               virDomainGraphicsDefPtr gfx)
-+
-+{
-+    virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
-+    virSecurityLabelDefPtr seclabel;
-+    uid_t user;
-+    gid_t group;
-+
-+    /* Skip chowning the shared render file if namespaces are disabled */
-+    if (!priv->mountNamespace)
-+        return 0;
-+
-+    seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME);
-+    if (seclabel && !seclabel->relabel)
-+        return 0;
-+
-+    if (virSecurityDACGetIds(seclabel, priv, &user, &group, NULL, NULL) < 0)
-+        return -1;
-+
-+    if (gfx->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE &&
-+        gfx->data.spice.gl == VIR_TRISTATE_BOOL_YES &&
-+        gfx->data.spice.rendernode) {
-+        if (virSecurityDACSetOwnership(priv, NULL,
-+                                       gfx->data.spice.rendernode,
-+                                       user, group) < 0)
-+            return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
-+static int
-+virSecurityDACRestoreGraphicsLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED,
-+                               virDomainDefPtr def ATTRIBUTE_UNUSED,
-+                               virDomainGraphicsDefPtr gfx ATTRIBUTE_UNUSED)
-+
-+{
-+    /* The only graphics labelling we do is dependent on mountNamespaces,
-+       in which case 'restoring' the label doesn't actually accomplish
-+       anything, so there's nothing to do here */
-+    return 0;
-+}
-+
-+
- static int
- virSecurityDACSetInputLabel(virSecurityManagerPtr mgr,
-                             virDomainDefPtr def,
-@@ -1489,6 +1537,11 @@ virSecurityDACRestoreAllLabel(virSecurityManagerPtr mgr,
-             rc = -1;
-     }
- 
-+    for (i = 0; i < def->ngraphics; i++) {
-+        if (virSecurityDACRestoreGraphicsLabel(mgr, def, def->graphics[i]) < 0)
-+            return -1;
-+    }
-+
-     for (i = 0; i < def->ninputs; i++) {
-         if (virSecurityDACRestoreInputLabel(mgr, def, def->inputs[i]) < 0)
-             rc = -1;
-@@ -1602,6 +1655,11 @@ virSecurityDACSetAllLabel(virSecurityManagerPtr mgr,
-             return -1;
-     }
- 
-+    for (i = 0; i < def->ngraphics; i++) {
-+        if (virSecurityDACSetGraphicsLabel(mgr, def, def->graphics[i]) < 0)
-+            return -1;
-+    }
-+
-     for (i = 0; i < def->ninputs; i++) {
-         if (virSecurityDACSetInputLabel(mgr, def, def->inputs[i]) < 0)
-             return -1;
@@ -1,63 +0,0 @@
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 31 Jul 2017 16:55:58 +0200
-Subject: [PATCH] qemu: Honour <on_reboot/>
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1476866
-
-For some reason, we completely ignore <on_reboot/> setting for
-domains. The implementation is simply not there. It never was.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 3ee9bdbe351c0b80d4c469571ef31df3f1b148ea)
---
- src/qemu/qemu_process.c | 27 ++++++++++++++++++++++++---
- 1 file changed, 24 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 992a7174b..7588212ba 100644
--- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -487,6 +487,7 @@ qemuProcessHandleReset(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
-     virObjectEventPtr event;
-     qemuDomainObjPrivatePtr priv;
-     virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
-+    int ret = -1;
- 
-     virObjectLock(vm);
- 
-@@ -498,12 +499,32 @@ qemuProcessHandleReset(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
-     if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0)
-         VIR_WARN("Failed to save status on vm %s", vm->def->name);
- 
-    virObjectUnlock(vm);
-+    if (vm->def->onReboot == VIR_DOMAIN_LIFECYCLE_DESTROY ||
-+        vm->def->onReboot == VIR_DOMAIN_LIFECYCLE_PRESERVE) {
- 
-    qemuDomainEventQueue(driver, event);
-+        if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
-+            goto cleanup;
-+
-+        if (!virDomainObjIsActive(vm)) {
-+            VIR_DEBUG("Ignoring RESET event from inactive domain %s",
-+                      vm->def->name);
-+            goto endjob;
-+        }
-+
-+        qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED,
-+                        QEMU_ASYNC_JOB_NONE, 0);
-+        virDomainAuditStop(vm, "destroyed");
-+        qemuDomainRemoveInactive(driver, vm);
-+     endjob:
-+        qemuDomainObjEndJob(driver, vm);
-+    }
- 
-+    ret = 0;
-+ cleanup:
-+    virObjectUnlock(vm);
-+    qemuDomainEventQueue(driver, event);
-     virObjectUnref(cfg);
-    return 0;
-+    return ret;
- }
- 
- 
@@ -1,113 +0,0 @@
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 27 Apr 2017 16:29:21 +0200
-Subject: [PATCH] qemuDomainBuildNamespace: Move /dev/* mountpoints later
-
-When setting up mount namespace for a qemu domain the following
-steps are executed:
-
-1) get list of mountpoints under /dev/
-2) move them to /var/run/libvirt/qemu/$domName.ext
-3) start constructing new device tree under /var/run/libvirt/qemu/$domName.dev
-4) move the mountpoint of the new device tree to /dev
-5) restore original mountpoints from step 2)
-
-Note the problem with this approach is that if some device in step
-3) requires access to a mountpoint from step 2) it will fail as
-the mountpoint is not there anymore. For instance consider the
-following domain disk configuration:
-
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source file='/dev/shm/vhostmd0'/>
-      <target dev='vdb' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/>
-    </disk>
-
-In this case operation fails as we are unable to create vhostmd0
-in the new device tree because after step 2) there is no /dev/shm
-anymore. Leave aside fact that we shouldn't try to create devices
-living in other mountpoints. That's a separate bug that will be
-addressed later.
-
-Currently, the order described above is rearranged to:
-
-1) get list of mountpoints under /dev/
-2) start constructing new device tree under /var/run/libvirt/qemu/$domName.dev
-3) move them to /var/run/libvirt/qemu/$domName.ext
-4) move the mountpoint of the new device tree to /dev
-5) restore original mountpoints from step 3)
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Cedric Bosdonnat <cbosdonnat@suse.com>
-(cherry picked from commit a7cc039dc796f541793955598377807af48341fb)
-(cherry picked from commit 469bf7cb7a44a0798c63e4b5e4682d8e38bce66e)
---
- src/qemu/qemu_domain.c | 48 ++++++++++++++++++++++++------------------------
- 1 file changed, 24 insertions(+), 24 deletions(-)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 4a127cedf..64f18f493 100644
--- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -7854,6 +7854,30 @@ qemuDomainBuildNamespace(virQEMUDriverConfigPtr cfg,
-     if (qemuDomainSetupDev(cfg, mgr, vm, devPath) < 0)
-         goto cleanup;
- 
-+    if (qemuDomainSetupAllDisks(cfg, vm, devPath) < 0)
-+        goto cleanup;
-+
-+    if (qemuDomainSetupAllHostdevs(cfg, vm, devPath) < 0)
-+        goto cleanup;
-+
-+    if (qemuDomainSetupAllMemories(cfg, vm, devPath) < 0)
-+        goto cleanup;
-+
-+    if (qemuDomainSetupAllChardevs(cfg, vm, devPath) < 0)
-+        goto cleanup;
-+
-+    if (qemuDomainSetupTPM(cfg, vm, devPath) < 0)
-+        goto cleanup;
-+
-+    if (qemuDomainSetupAllGraphics(cfg, vm, devPath) < 0)
-+        goto cleanup;
-+
-+    if (qemuDomainSetupAllInputs(cfg, vm, devPath) < 0)
-+        goto cleanup;
-+
-+    if (qemuDomainSetupAllRNGs(cfg, vm, devPath) < 0)
-+        goto cleanup;
-+
-     /* Save some mount points because we want to share them with the host */
-     for (i = 0; i < ndevMountsPath; i++) {
-         struct stat sb;
-@@ -7881,30 +7905,6 @@ qemuDomainBuildNamespace(virQEMUDriverConfigPtr cfg,
-             goto cleanup;
-     }
- 
-    if (qemuDomainSetupAllDisks(cfg, vm, devPath) < 0)
-        goto cleanup;
-
-    if (qemuDomainSetupAllHostdevs(cfg, vm, devPath) < 0)
-        goto cleanup;
-
-    if (qemuDomainSetupAllMemories(cfg, vm, devPath) < 0)
-        goto cleanup;
-
-    if (qemuDomainSetupAllChardevs(cfg, vm, devPath) < 0)
-        goto cleanup;
-
-    if (qemuDomainSetupTPM(cfg, vm, devPath) < 0)
-        goto cleanup;
-
-    if (qemuDomainSetupAllGraphics(cfg, vm, devPath) < 0)
-        goto cleanup;
-
-    if (qemuDomainSetupAllInputs(cfg, vm, devPath) < 0)
-        goto cleanup;
-
-    if (qemuDomainSetupAllRNGs(cfg, vm, devPath) < 0)
-        goto cleanup;
-
-     if (virFileMoveMount(devPath, "/dev") < 0)
-         goto cleanup;
- 
@@ -1,71 +0,0 @@
-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Thu, 5 Oct 2017 17:54:28 +0100
-Subject: [PATCH] qemu: ensure TLS clients always verify the server certificate
-
-The default_tls_x509_verify (and related) parameters in qemu.conf
-control whether the QEMU TLS servers request & verify certificates
-from clients. This works as a simple access control system for
-servers by requiring the CA to issue certs to permitted clients.
-This use of client certificates is disabled by default, since it
-requires extra work to issue client certificates.
-
-Unfortunately the code was using this configuration parameter when
-setting up both TLS clients and servers in QEMU. The result was that
-TLS clients for character devices and disk devices had verification
-turned off, meaning they would ignore errors while validating the
-server certificate.
-
-This allows for trivial MITM attacks between client and server,
-as any certificate returned by the attacker will be accepted by
-the client.
-
-This is assigned CVE-2017-1000256  / LSN-2017-0002
-
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-(cherry picked from commit 441d3eb6d1be940a67ce45a286602a967601b157)
---
- src/qemu/qemu_command.c                                                 | 2 +-
- tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args     | 2 +-
- .../qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args                 | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 311edd13e..141831635 100644
--- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -727,7 +727,7 @@ qemuBuildTLSx509BackendProps(const char *tlspath,
-     if (virJSONValueObjectCreate(propsret,
-                                  "s:dir", path,
-                                  "s:endpoint", (isListen ? "server": "client"),
-                                 "b:verify-peer", verifypeer,
-+                                 "b:verify-peer", (isListen ? verifypeer : true),
-                                  NULL) < 0)
-         goto cleanup;
- 
-diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args
-index b456cce30..003d11de7 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args
-@@ -26,7 +26,7 @@ server,nowait \
- localport=1111 \
- -device isa-serial,chardev=charserial0,id=serial0 \
- -object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,\
-endpoint=client,verify-peer=no \
-+endpoint=client,verify-peer=yes \
- -chardev socket,id=charserial1,host=127.0.0.1,port=5555,\
- tls-creds=objcharserial1_tls0 \
- -device isa-serial,chardev=charserial1,id=serial1 \
-diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args
-index 7f9fedb6c..a020ff006 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-secret-chardev.args
-@@ -31,7 +31,7 @@ localport=1111 \
- data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,\
- keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
- -object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,\
-endpoint=client,verify-peer=no,passwordid=charserial1-secret0 \
-+endpoint=client,verify-peer=yes,passwordid=charserial1-secret0 \
- -chardev socket,id=charserial1,host=127.0.0.1,port=5555,\
- tls-creds=objcharserial1_tls0 \
- -device isa-serial,chardev=charserial1,id=serial1 \
@@ -1 +1 @@
-SHA512 (libvirt-3.2.1.tar.xz) = 4ec4faceedcad3a5419e91444b0c83adcbed0ff6482fb53c058a75412064de69e09fd096de4a30b8c1149da6ba03287b10e8af925b01d725e655658035e43d9a
+SHA512 (libvirt-5.1.0.tar.xz) = ca64d7be683614bdeb20a8865655fe80f911cf13c00aed2334db3a2e4131e1dd6fe5e9663a24e6f82161ad5aa53f1a2637cd21730eed46e4764b7eebced94f3f
Author	SHA1	Message	Date
Cole Robinson	5fccec3f3b	libvirt-5.1.0-9.fc30 CVE-2019-10161: arbitrary file read/exec via virDomainSaveImageGetXMLDesc API (bz #1722463, bz #1720115) CVE-2019-10166: virDomainManagedSaveDefineXML API exposed to readonly clients (bz #1722462, bz #1720114) CVE-2019-10167: arbitrary command execution via virConnectGetDomainCapabilities API (bz #1722464, bz #1720117) CVE-2019-10168: arbitrary command execution via virConnectBaselineHypervisorCPU and virConnectCompareHypervisorCPU APIs (bz #1722466, bz #1720118) CVE-2019-3886: virsh domhostname command discloses guest hostname in readonly mode [fedora-rawhide Cannot start VM with a CBR 2.0 TPM device (bz #1712556) libvirtd does not update VM .xml configurations after virsh snapshot/blockcommit (bz #1722348)	2019-06-20 12:40:47 -04:00
Adam Williamson	e698b1d369	Change the %post fix to match upstream Upstream fixed this by making the %post scriptlet use %with_firewalld_zone rather than making the BuildRequires use %with_firewalld, so let's follow that. Signed-off-by: Adam Williamson <awilliam@redhat.com>	2019-05-31 08:54:40 -07:00
Adam Williamson	97d2066b3e	Fix scriptlet error when built without firewalld zone support In `5cbc0451`, Daniel added a use of the %firewalld_reload macro that's conditional on `with_firewalld`, but made the BuildRequire on firewalld-filesystem (which provides the macro) conditional on `with_firewalld_zone`. So if you build without firewalld_zone but with firewalld, the macro is not expanded and the built package has a broken %post script. This fixes it by making the BuildRequire also conditional on `with_firewalld`.	2019-05-31 08:13:41 -07:00
Adam Williamson	1fefcb5913	Do without-firewalld-zone more like upstream did it https://gitlab.com/libvirt/libvirt/commit/65b08aff08df4eb9593620274e5a09e1b92f24aa Signed-off-by: Adam Williamson <awilliam@redhat.com>	2019-05-29 12:05:17 -07:00
Adam Williamson	310d2dbd80	Pass --without-firewalld-zone to configure (#1699051 )	2019-05-29 11:58:54 -07:00
Daniel P. Berrangé	0649b336a0	Fix systemd socket permissions (CVE-2019-10132) Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2019-05-21 17:06:01 +01:00
Daniel P. Berrangé	8d00f2a3c0	Define md-clear CPUID bit CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091 Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2019-05-14 19:28:04 +01:00
Cole Robinson	90bdf4b1ee	libvirt-5.1.0-4.fc30 Mouse cursor doubled on QEMU VNC on ppc64le (bz #1565253) Fix VM startup with cgroupv2 (bz #1688736)	2019-04-02 12:09:23 -04:00
Daniel P. Berrangé	d670e246d0	Fix rbd upgrade compat & deprecations and networking Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2019-03-20 17:42:59 +00:00
Igor Gnatenko	50e7b9a91d	Remove obsolete scriptlets Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>	2019-03-06 09:47:43 +01:00
Daniel P. Berrangé	5cbc0451ce	Update to 5.1.0 release Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2019-03-04 10:57:08 +00:00
Igor Gnatenko	b420054636	Rebuild for readline 8.0	2019-02-17 09:30:51 +01:00
Fedora Release Engineering	143fedee46	- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2019-02-01 08:30:03 +00:00
Daniel P. Berrangé	88887cac0f	Update to 5.0.0 release Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2019-01-21 12:19:06 +00:00
Daniel P. Berrangé	579afc99f2	Disable RBD on 32-bit arches Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2018-12-10 18:33:58 +00:00
Daniel P. Berrangé	7f5808b9d0	Update to 4.10.0 release Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2018-12-03 13:55:36 +00:00
Daniel P. Berrangé	4df5f77071	Update to 4.9.0 release Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2018-11-12 14:53:44 +00:00
Daniel P. Berrangé	1bdd527daf	Update to 4.8.0 release Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2018-10-05 14:25:26 +01:00
Daniel P. Berrangé	e5fa1c00d2	Update to 4.7.0 release Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2018-09-04 10:43:47 +01:00
David Abdurachmanov	18f7b8c79c	Add support for RISC-V (riscv64)	2018-08-19 19:41:56 +01:00
Daniel P. Berrangé	782468f8e9	Update to 4.6.0 release Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2018-08-06 14:07:24 +01:00
Fedora Release Engineering	202e7d9569	- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2018-07-13 09:01:16 +00:00
Daniel P. Berrangé	0676a07265	Fix regressions in chardev handling Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2018-07-06 11:30:44 +01:00
Daniel P. Berrangé	f57ce74947	Update to 4.5.0 release Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2018-07-03 11:00:57 +01:00
Daniel P. Berrangé	851cfde15b	Fix typo in date Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2018-06-05 12:49:52 +01:00
Daniel P. Berrangé	06123137eb	Update to 4.4.0 release Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2018-06-05 12:30:16 +01:00
Igor Gnatenko	6ccf3cb58c	Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>	2018-05-07 09:38:07 +02:00
Igor Gnatenko	030ddaa4ef	Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>	2018-05-07 09:38:07 +02:00
Daniel P. Berrangé	a8886736c4	Set wireshark plugin dir dynamically Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2018-05-03 12:26:11 +01:00
Daniel P. Berrangé	4fd635e537	Update to 4.3.0 release Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2018-05-03 10:55:46 +01:00
Daniel P. Berrangé	6210c457fc	Update to 4.2.0 release Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2018-04-03 13:42:58 +01:00
Iryna Shcherbina	82926cfdf0	Update Python 2 dependency declarations to new packaging standards	2018-03-23 23:29:56 +01:00
Daniel P. Berrangé	e7a3ca6f6b	Fix systemd macro argument with line continuations (rhbz#1558648) Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2018-03-21 09:38:28 +00:00
Daniel P. Berrangé	1ae6f647b7	Upload 4.1.0 sources Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2018-03-05 13:36:35 +00:00
Daniel P. Berrangé	48941c011f	Rebase to version 4.1.0 Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2018-03-05 13:31:54 +00:00
Igor Gnatenko	a3c4cc6f3d	Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>	2018-02-14 09:28:07 +01:00
Igor Gnatenko	90fbcbd48f	Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>	2018-02-13 23:44:12 +01:00
Fedora Release Engineering	6efd96d995	- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2018-02-07 23:38:57 +00:00
Daniel P. Berrange	21316e7a45	Avoid undefined symbols from new linker flags Signed-off-by: Daniel P. Berrange <berrange@redhat.com>	2018-01-23 13:01:06 +00:00
Daniel P. Berrange	8adbb7a402	Cull changelog before 2017 Signed-off-by: Daniel P. Berrange <berrange@redhat.com>	2018-01-19 17:34:53 +00:00
Daniel P. Berrange	3f19d41908	Fix rpc package name Signed-off-by: Daniel P. Berrange <berrange@redhat.com>	2018-01-19 16:37:43 +00:00
Daniel P. Berrange	34da93e0c9	Fix typos Signed-off-by: Daniel P. Berrange <berrange@redhat.com>	2018-01-19 16:30:19 +00:00
Daniel P. Berrange	208f506190	Add rpcgen + tirpc-devel dependancies Signed-off-by: Daniel P. Berrange <berrange@redhat.com>	2018-01-19 16:28:25 +00:00
Daniel P. Berrange	0ca715cad9	Update to version 4.0.0 Signed-off-by: Daniel P. Berrange <berrange@redhat.com>	2018-01-19 16:14:30 +00:00
Cole Robinson	0f5d8c1c22	Rebuild for xen 4.10	2017-12-20 07:05:15 -05:00
Daniel P. Berrange	a56bcbd063	Update to 3.10.0 release Signed-off-by: Daniel P. Berrange <berrange@redhat.com>	2017-12-05 11:11:01 +00:00
Daniel P. Berrange	89c3fa751c	Update to 3.9.0 release Signed-off-by: Daniel P. Berrange <berrange@redhat.com>	2017-11-03 11:14:48 +00:00
Daniel P. Berrange	051644ffcb	Update to 3.8.0 release Signed-off-by: Daniel P. Berrange <berrange@redhat.com>	2017-10-04 14:46:26 +01:00
Daniel P. Berrange	2a9c282548	Update to 3.7.0 release Signed-off-by: Daniel P. Berrange <berrange@redhat.com>	2017-09-04 11:33:13 +01:00
Daniel P. Berrange	2ae80af461	Disable qemumonitorjsontest temporarily Signed-off-by: Daniel P. Berrange <berrange@redhat.com>	2017-08-04 10:30:58 +01:00
Daniel P. Berrange	7335ede0e1	Rebase to 3.6.0 Signed-off-by: Daniel P. Berrange <berrange@redhat.com>	2017-08-02 10:47:35 +01:00
Florian Weimer	6c92ba3805	Rebuild with fixed binutils for ppc64le (#1475636 )	2017-07-30 19:09:40 +02:00
Daniel P. Berrange	446f680673	Disabled RBD on i386, arm, ppc64 (rhbz #1474743 ) Signed-off-by: Daniel P. Berrange <berrange@redhat.com>	2017-07-25 11:11:19 +01:00
Daniel P. Berrange	3f56aa2870	Rebuild for changed rbd soname Signed-off-by: Daniel P. Berrange <berrange@redhat.com>	2017-07-25 09:14:27 +01:00
Cole Robinson	3cec91694f	Remove unused patch	2017-07-17 09:01:37 -04:00
Cole Robinson	cb0cfa566f	Rebuild for xen 4.9	2017-07-17 09:00:52 -04:00
Petr Písař	a27acebf66	perl dependency renamed to perl-interpreter <https://fedoraproject.org/wiki/Changes/perl_Package_to_Install_Core_Modules >	2017-07-12 15:20:34 +02:00
Daniel P. Berrange	99d3a0ca1a	Update to 3.5.0 release Signed-off-by: Daniel P. Berrange <berrange@redhat.com>	2017-07-06 15:32:03 +01:00
Daniel P. Berrange	9c962ebc4f	Add patch to fix gnulib build Signed-off-by: Daniel P. Berrange <berrange@redhat.com>	2017-06-05 11:13:10 +01:00
Daniel P. Berrange	99cbbf6606	Fix clash between gnulib and glibc system headers Signed-off-by: Daniel P. Berrange <berrange@redhat.com>	2017-06-05 11:11:32 +01:00
Daniel P. Berrange	b73e509648	Update to 3.4.0 release Signed-off-by: Daniel P. Berrange <berrange@redhat.com>	2017-06-02 12:08:34 +01:00
Daniel P. Berrange	b23ff9c0f7	Update to 3.3.0 release Signed-off-by: Daniel P. Berrange <berrange@redhat.com>	2017-05-08 10:45:19 +01:00
Cole Robinson	20f9ed9c4c	Remove unused patch	2017-05-04 20:10:10 -04:00