Fix systemd socket permissions (CVE-2019-10132)

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Remove mistakenly added stibp feature from tests
2019-05-21 17:07:31 +01:00 · 2019-05-14 21:21:10 +01:00 · 2019-05-14 20:26:55 +01:00 · 2018-08-23 14:56:26 -04:00 · 2018-07-03 12:24:47 -04:00 · 2018-06-18 19:03:25 +01:00
35 changed files with 1347 additions and 1562 deletions
@@ -0,0 +1,32 @@
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Mon, 21 May 2018 23:05:07 +0100
+Subject: [PATCH] cpu: define the 'ssbd' CPUID feature bit (CVE-2018-3639)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+New microcode introduces the "Speculative Store Bypass Disable"
+CPUID feature bit. This needs to be exposed to guest OS to allow
+them to protect against CVE-2018-3639.
+
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit 1dbca2eccad58d91a5fd33962854f1a653638182)
+---
+ src/cpu/cpu_map.xml | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
+index 00a43b172c..245aec3309 100644
+--- a/src/cpu/cpu_map.xml
+++ b/src/cpu/cpu_map.xml
+@@ -298,6 +298,9 @@
+     <feature name='spec-ctrl'>
+       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x04000000'/>
+     </feature>
+    <feature name='ssbd'>
+      <cpuid eax_in='0x07' ecx_in='0x00' edx='0x80000000'/>
+    </feature>
+ 
+     <!-- Processor Extended State Enumeration sub leaf 1 -->
+     <feature name='xsaveopt'>
@@ -1,145 +0,0 @@
-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,92 +0,0 @@
-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
@@ -0,0 +1,65 @@
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Mon, 5 Mar 2018 12:46:16 +0000
+Subject: [PATCH] tests: force use of "NORMAL" TLS priority in test suite
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When generating certificates we rely on GNUTLS' built-in default setup
+for the ciphers used in the certs. We then currently run with the distro
+specific TLS priority setup which can be much stronger, to the extent
+that the certificates we generate are considered untrustworthy. We don't
+care about the quality of the ciphers we use in the test suite, so just
+force the priority to "NORMAL" which should ensure our certs are
+accepted by GNUTLS.
+
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+---
+ tests/virnettlscontexttest.c | 4 ++--
+ tests/virnettlssessiontest.c | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c
+index 089c10e964..86647f3014 100644
+--- a/tests/virnettlscontexttest.c
+++ b/tests/virnettlscontexttest.c
+@@ -72,7 +72,7 @@ static int testTLSContextInit(const void *opaque)
+                                          data->crt,
+                                          KEYFILE,
+                                          NULL,
+-                                         NULL,
+                                         "NORMAL",
+                                          true,
+                                          true);
+     } else {
+@@ -80,7 +80,7 @@ static int testTLSContextInit(const void *opaque)
+                                          NULL,
+                                          data->crt,
+                                          KEYFILE,
+-                                         NULL,
+                                         "NORMAL",
+                                          true,
+                                          true);
+     }
+diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c
+index 6d639e5b16..7e85607181 100644
+--- a/tests/virnettlssessiontest.c
+++ b/tests/virnettlssessiontest.c
+@@ -113,7 +113,7 @@ static int testTLSSessionInit(const void *opaque)
+                                            data->servercrt,
+                                            KEYFILE,
+                                            data->wildcards,
+-                                           NULL,
+                                           "NORMAL",
+                                            false,
+                                            true);
+ 
+@@ -121,7 +121,7 @@ static int testTLSSessionInit(const void *opaque)
+                                            NULL,
+                                            data->clientcrt,
+                                            KEYFILE,
+-                                           NULL,
+                                           "NORMAL",
+                                            false,
+                                            true);
+ 
@@ -0,0 +1,42 @@
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Mon, 21 May 2018 23:05:08 +0100
+Subject: [PATCH] cpu: define the 'virt-ssbd' CPUID feature bit (CVE-2018-3639)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some AMD processors only support a non-architectural means of
+enabling Speculative Store Bypass Disable. To allow simplified
+handling in virtual environments, hypervisors will expose an
+architectural definition through CPUID bit 0x80000008_EBX[25].
+This needs to be exposed to guest OS running on AMD x86 hosts to
+allow them to protect against CVE-2018-3639.
+
+Note that since this CPUID bit won't be present in the host CPUID
+results on physical hosts, it will not be enabled automatically
+in guests configured with "host-model" CPU unless using QEMU
+version >= 2.9.0. Thus for older versions of QEMU, this feature
+must be manually enabled using policy=force. Guests using the
+"host-passthrough" CPU mode do not need special handling.
+
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+(cherry picked from commit 9267342206ce17f6933d57a3128cdc504d5945c9)
+---
+ src/cpu/cpu_map.xml | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
+index 245aec3309..96daa0f9af 100644
+--- a/src/cpu/cpu_map.xml
+++ b/src/cpu/cpu_map.xml
+@@ -433,6 +433,9 @@
+     <feature name='ibpb'>
+       <cpuid eax_in='0x80000008' ebx='0x00001000'/>
+     </feature>
+    <feature name='virt-ssbd'>
+      <cpuid eax_in='0x80000008' ebx='0x02000000'/>
+    </feature>
+ 
+     <!-- models -->
+     <model name='486'>
@@ -1,133 +0,0 @@
-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);
@@ -0,0 +1,31 @@
+From: Jim Fehlig <jfehlig@suse.com>
+Date: Wed, 14 Mar 2018 16:42:39 -0600
+Subject: [PATCH] lockd: fix typo in virtlockd-admin.socket
+
+Commit ce7ae55ea1 introduced a typo in virtlockd-admin socket file
+
+/usr/lib/systemd/system/virtlockd-admin.socket:7: Unknown lvalue
+'Server' in section 'Socket'
+
+Change 'Server' to 'Service'.
+
+Signed-off-by: Jim Fehlig <jfehlig@suse.com>
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+---
+ src/locking/virtlockd-admin.socket.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/locking/virtlockd-admin.socket.in b/src/locking/virtlockd-admin.socket.in
+index 1fa0a3dc33..2a7500f3d0 100644
+--- a/src/locking/virtlockd-admin.socket.in
+++ b/src/locking/virtlockd-admin.socket.in
+@@ -4,7 +4,7 @@ Before=libvirtd.service
+ 
+ [Socket]
+ ListenStream=@localstatedir@/run/libvirt/virtlockd-admin-sock
+-Server=virtlockd.service
+Service=virtlockd.service
+ 
+ [Install]
+ WantedBy=sockets.target
@@ -1,149 +0,0 @@
-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,46 +0,0 @@
-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,105 @@
+From: Laine Stump <laine@laine.org>
+Date: Wed, 25 Apr 2018 17:12:03 -0400
+Subject: [PATCH] nwfilter: increase pcap buffer size to be compatible with
+ TPACKET_V3
+
+When an nwfilter rule sets the parameter CTRL_IP_LEARNING to "dhcp",
+this turns on the "dhcpsnoop" thread, which uses libpcap to monitor
+traffic on the domain's tap device and extract the IP address from the
+DHCP response.
+
+If libpcap on the host is built with HAVE_TPACKET3 defined (to enable
+support for TPACKET_V3), the dhcpsnoop code's initialization of the
+libpcap socket would fail with the following error:
+
+  virNWFilterSnoopDHCPOpen:1134 : internal error: pcap_setfilter: can't remove kernel filter: Bad file descriptor
+
+It turns out that this was because TPACKET_V3 requires a larger buffer
+size than libvirt was setting (we were setting it to 128k). Changing
+the buffer size to 256k eliminates the error, and the dhcpsnoop thread
+once again works properly.
+
+A fuller explanation of why TPACKET_V3 requires such a large buffer,
+for future git spelunkers:
+
+libpcap calls setsockopt(... SOL_PACKET, PACKET_RX_RING...) to setup a
+ring buffer for receiving packets; two of the attributes sent to this
+API are called tp_frame_size, and tp_frame_nr. If libpcap was built
+with HAVE_TPACKET3 defined, tp_trame_size is set to MAXIMUM_SNAPLEN
+(defined in libpcap sources as 262144) and tp_frame_nr is set to:
+
+ [the buffer size we set, i.e. PCAP_BUFFERSIZE i.e. 262144] / tp_frame_size.
+
+So if PCAP_BUFFERSIZE < MAXIMUM_SNAPLEN, then tp_frame_nr (the number
+of frames in the ring buffer) is 0, which is nonsensical. This same
+value is later used as a multiplier to determine the size for a call
+to malloc() (which would also fail).
+
+(NB: if HAVE_TPACKET3 is *not* defined, then tp_frame_size is set to
+the snaplen set by the user (in our case 576) plus a small amount to
+account for ethernet headers, so 256k is far more than adequate)
+
+Since the TPACKET_V3 code in libpcap actually reads multiple packets
+into each frame, it's not a problem to have only a single frame
+(especially when we are monitoring such infrequent traffic), so it's
+okay to set this relatively small buffer size (in comparison to the
+default, which is 2MB), which is important since every guest using
+dhcp snooping in a nwfilter rule will hold 2 of these buffers for the
+entire life of the guest.
+
+Thanks to Christian Ehrhardt for discovering that buffer size was the
+problem (this was not at all obvious from the error that was logged!)
+
+Resolves: https://bugzilla.redhat.com/1547237
+Fixes: https://bugs.launchpad.net/libvirt/+bug/1758037
+
+Signed-off-by: Laine Stump <laine@laine.org>
+Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com> (V1)
+Reviewed-by: John Ferlan <jferlan@redhat.com>
+Tested-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+---
+ src/nwfilter/nwfilter_dhcpsnoop.c | 22 +++++++++++++++++++---
+ 1 file changed, 19 insertions(+), 3 deletions(-)
+
+diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
+index 6069e70460..50cfb944a2 100644
+--- a/src/nwfilter/nwfilter_dhcpsnoop.c
+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
+@@ -256,10 +256,21 @@ struct _virNWFilterDHCPDecodeJob {
+ # define DHCP_BURST_INTERVAL_S  10 /* sec */
+ 
+ /*
+- * libpcap 1.5 requires a 128kb buffer
+- * 128 kb is bigger than (DHCP_PKT_BURST * PCAP_PBUFSIZE / 2)
+ * NB: Any libpcap built with HAVE_TPACKET3 will require
+ * PCAP_BUFFERSIZE to be at least 262144 (although
+ * pcap_set_buffer_size() with a lower value will succeed, and the
+ * error will only show up later when pcap_setfilter() is called).
+ *
+ * It is possible that in the future libpcap could increase the
+ * minimum size even further, but due to the fact that each guest
+ * using dhcp snooping keeps 2 pcap sockets open (and thus 2 buffers
+ * allocated) for the life of the guest, we want to minimize the
+ * length of the buffer, so instead of leaving it at the default size
+ * (2MB), we are setting it to the minimum viable size and including
+ * this clue in the source to help quickly resolve the problem when/if
+ * it reoccurs.
+  */
+-# define PCAP_BUFFERSIZE        (128 * 1024)
+# define PCAP_BUFFERSIZE        (256 * 1024)
+ 
+ # define MAX_QUEUED_JOBS        (DHCP_PKT_BURST + 2 * DHCP_PKT_RATE)
+ 
+@@ -1114,6 +1125,11 @@ virNWFilterSnoopDHCPOpen(const char *ifname, virMacAddr *mac,
+         goto cleanup_nohandle;
+     }
+ 
+    /* IMPORTANT: If there is any failure of *any* pcap_* function
+     * during setup of the socket, look to the comment where
+     * PCAP_BUFFERSIZE is defined. It may be too small, even if the
+     * generated error doesn't imply that.
+     */
+     if (pcap_set_snaplen(handle, PCAP_PBUFSIZE) < 0 ||
+         pcap_set_buffer_size(handle, PCAP_BUFFERSIZE) < 0 ||
+         pcap_activate(handle) < 0) {
@@ -1,57 +0,0 @@
-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,
@@ -0,0 +1,253 @@
+From: Vincent Bernat <vincent@bernat.im>
+Date: Tue, 10 Apr 2018 08:27:15 +0200
+Subject: [PATCH] util: don't check for parallel iteration in hash-related
+ functions
+
+This is the responsability of the caller to apply the correct lock
+before using these functions. Moreover, the use of a simple boolean
+was still racy: two threads may check the boolean and "lock" it
+simultaneously.
+
+Users of functions from src/util/virhash.c have to be checked for
+correctness. Lookups and iteration should hold a RO
+lock. Modifications should hold a RW lock.
+
+Most important uses seem to be covered. Callers have now a greater
+responsability, notably the ability to execute some operations while
+iterating were reliably forbidden before are now accepted.
+
+Signed-off-by: Vincent Bernat <vincent@bernat.im>
+(cherry picked from commit 4d7384eb9ddef2008cb0cc165eb808f74bc83d6b)
+---
+ src/util/virhash.c  | 37 --------------------
+ tests/virhashtest.c | 83 ---------------------------------------------
+ 2 files changed, 120 deletions(-)
+
+diff --git a/src/util/virhash.c b/src/util/virhash.c
+index 0ffbfcce2c..475c2b0281 100644
+--- a/src/util/virhash.c
+++ b/src/util/virhash.c
+@@ -41,12 +41,6 @@ VIR_LOG_INIT("util.hash");
+ 
+ /* #define DEBUG_GROW */
+ 
+-#define virHashIterationError(ret) \
+-    do { \
+-        VIR_ERROR(_("Hash operation not allowed during iteration")); \
+-        return ret; \
+-    } while (0)
+-
+ /*
+  * A single entry in the hash table
+  */
+@@ -66,10 +60,6 @@ struct _virHashTable {
+     uint32_t seed;
+     size_t size;
+     size_t nbElems;
+-    /* True iff we are iterating over hash entries. */
+-    bool iterating;
+-    /* Pointer to the current entry during iteration. */
+-    virHashEntryPtr current;
+     virHashDataFree dataFree;
+     virHashKeyCode keyCode;
+     virHashKeyEqual keyEqual;
+@@ -339,9 +329,6 @@ virHashAddOrUpdateEntry(virHashTablePtr table, const void *name,
+     if ((table == NULL) || (name == NULL))
+         return -1;
+ 
+-    if (table->iterating)
+-        virHashIterationError(-1);
+-
+     key = virHashComputeKey(table, name);
+ 
+     /* Check for duplicate entry */
+@@ -551,9 +538,6 @@ virHashRemoveEntry(virHashTablePtr table, const void *name)
+     nextptr = table->table + virHashComputeKey(table, name);
+     for (entry = *nextptr; entry; entry = entry->next) {
+         if (table->keyEqual(entry->name, name)) {
+-            if (table->iterating && table->current != entry)
+-                virHashIterationError(-1);
+-
+             if (table->dataFree)
+                 table->dataFree(entry->payload, entry->name);
+             if (table->keyFree)
+@@ -593,18 +577,11 @@ virHashForEach(virHashTablePtr table, virHashIterator iter, void *data)
+     if (table == NULL || iter == NULL)
+         return -1;
+ 
+-    if (table->iterating)
+-        virHashIterationError(-1);
+-
+-    table->iterating = true;
+-    table->current = NULL;
+     for (i = 0; i < table->size; i++) {
+         virHashEntryPtr entry = table->table[i];
+         while (entry) {
+             virHashEntryPtr next = entry->next;
+-            table->current = entry;
+             ret = iter(entry->payload, entry->name, data);
+-            table->current = NULL;
+ 
+             if (ret < 0)
+                 goto cleanup;
+@@ -615,7 +592,6 @@ virHashForEach(virHashTablePtr table, virHashIterator iter, void *data)
+ 
+     ret = 0;
+  cleanup:
+-    table->iterating = false;
+     return ret;
+ }
+ 
+@@ -643,11 +619,6 @@ virHashRemoveSet(virHashTablePtr table,
+     if (table == NULL || iter == NULL)
+         return -1;
+ 
+-    if (table->iterating)
+-        virHashIterationError(-1);
+-
+-    table->iterating = true;
+-    table->current = NULL;
+     for (i = 0; i < table->size; i++) {
+         virHashEntryPtr *nextptr = table->table + i;
+ 
+@@ -667,7 +638,6 @@ virHashRemoveSet(virHashTablePtr table,
+             }
+         }
+     }
+-    table->iterating = false;
+ 
+     return count;
+ }
+@@ -723,23 +693,16 @@ void *virHashSearch(const virHashTable *ctable,
+     if (table == NULL || iter == NULL)
+         return NULL;
+ 
+-    if (table->iterating)
+-        virHashIterationError(NULL);
+-
+-    table->iterating = true;
+-    table->current = NULL;
+     for (i = 0; i < table->size; i++) {
+         virHashEntryPtr entry;
+         for (entry = table->table[i]; entry; entry = entry->next) {
+             if (iter(entry->payload, entry->name, data)) {
+-                table->iterating = false;
+                 if (name)
+                     *name = table->keyCopy(entry->name);
+                 return entry->payload;
+             }
+         }
+     }
+-    table->iterating = false;
+ 
+     return NULL;
+ }
+diff --git a/tests/virhashtest.c b/tests/virhashtest.c
+index 3b85b62c30..e9c03c1afb 100644
+--- a/tests/virhashtest.c
+++ b/tests/virhashtest.c
+@@ -221,32 +221,6 @@ testHashRemoveForEachAll(void *payload ATTRIBUTE_UNUSED,
+ }
+ 
+ 
+-const int testHashCountRemoveForEachForbidden = ARRAY_CARDINALITY(uuids);
+-
+-static int
+-testHashRemoveForEachForbidden(void *payload ATTRIBUTE_UNUSED,
+-                               const void *name,
+-                               void *data)
+-{
+-    virHashTablePtr hash = data;
+-    size_t i;
+-
+-    for (i = 0; i < ARRAY_CARDINALITY(uuids_subset); i++) {
+-        if (STREQ(uuids_subset[i], name)) {
+-            int next = (i + 1) % ARRAY_CARDINALITY(uuids_subset);
+-
+-            if (virHashRemoveEntry(hash, uuids_subset[next]) == 0) {
+-                VIR_TEST_VERBOSE(
+-                        "\nentry \"%s\" should not be allowed to be removed",
+-                        uuids_subset[next]);
+-            }
+-            break;
+-        }
+-    }
+-    return 0;
+-}
+-
+-
+ static int
+ testHashRemoveForEach(const void *data)
+ {
+@@ -303,61 +277,6 @@ testHashSteal(const void *data ATTRIBUTE_UNUSED)
+ }
+ 
+ 
+-static int
+-testHashIter(void *payload ATTRIBUTE_UNUSED,
+-             const void *name ATTRIBUTE_UNUSED,
+-             void *data ATTRIBUTE_UNUSED)
+-{
+-    return 0;
+-}
+-
+-static int
+-testHashForEachIter(void *payload ATTRIBUTE_UNUSED,
+-                    const void *name ATTRIBUTE_UNUSED,
+-                    void *data)
+-{
+-    virHashTablePtr hash = data;
+-
+-    if (virHashAddEntry(hash, uuids_new[0], NULL) == 0)
+-        VIR_TEST_VERBOSE("\nadding entries in ForEach should be forbidden");
+-
+-    if (virHashUpdateEntry(hash, uuids_new[0], NULL) == 0)
+-        VIR_TEST_VERBOSE("\nupdating entries in ForEach should be forbidden");
+-
+-    if (virHashSteal(hash, uuids_new[0]) != NULL)
+-        VIR_TEST_VERBOSE("\nstealing entries in ForEach should be forbidden");
+-
+-    if (virHashSteal(hash, uuids_new[0]) != NULL)
+-        VIR_TEST_VERBOSE("\nstealing entries in ForEach should be forbidden");
+-
+-    if (virHashForEach(hash, testHashIter, NULL) >= 0)
+-        VIR_TEST_VERBOSE("\niterating through hash in ForEach"
+-                " should be forbidden");
+-    return 0;
+-}
+-
+-static int
+-testHashForEach(const void *data ATTRIBUTE_UNUSED)
+-{
+-    virHashTablePtr hash;
+-    int ret = -1;
+-
+-    if (!(hash = testHashInit(0)))
+-        return -1;
+-
+-    if (virHashForEach(hash, testHashForEachIter, hash)) {
+-        VIR_TEST_VERBOSE("\nvirHashForEach didn't go through all entries");
+-        goto cleanup;
+-    }
+-
+-    ret = 0;
+-
+- cleanup:
+-    virHashFree(hash);
+-    return ret;
+-}
+-
+-
+ static int
+ testHashRemoveSetIter(const void *payload ATTRIBUTE_UNUSED,
+                       const void *name,
+@@ -628,9 +547,7 @@ mymain(void)
+     DO_TEST("Remove", Remove);
+     DO_TEST_DATA("Remove in ForEach", RemoveForEach, Some);
+     DO_TEST_DATA("Remove in ForEach", RemoveForEach, All);
+-    DO_TEST_DATA("Remove in ForEach", RemoveForEach, Forbidden);
+     DO_TEST("Steal", Steal);
+-    DO_TEST("Forbidden ops in ForEach", ForEach);
+     DO_TEST("RemoveSet", RemoveSet);
+     DO_TEST("Search", Search);
+     DO_TEST("GetItems", GetItems);
@@ -0,0 +1,64 @@
+From: Matthias Bolte <matthias.bolte@googlemail.com>
+Date: Thu, 2 Aug 2018 17:33:37 +0200
+Subject: [PATCH] esx: Fix double-free and freeing static strings in
+ esxDomainSetAutostart
+
+Since commit ae83e02f3dd7fe99fed5d8159a35b666fafeafd5#l3393 the
+newPowerInfo pointer itself is used to track the ownership of the
+AutoStartPowerInfo object to make Coverity understand the code better.
+This broke the code that unset some members of the AutoStartPowerInfo
+object that should not be freed the normal way.
+
+Instead, transfer ownership of the AutoStartPowerInfo object to the
+HostAutoStartManagerConfig object before filling in the values that
+need special handling. This allows to free the AutoStartPowerInfo
+directly without having to deal with the special values, or to let
+the old (now restored) logic handle the special values again.
+
+Signed-off-by: Matthias Bolte <matthias.bolte@googlemail.com>
+Tested-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
+Reviewed-by: John Ferlan <jferlan@redhat.com>
+(cherry picked from commit 3ad77f853230f870efa396636e008292c7f2b1c0)
+---
+ src/esx/esx_driver.c | 14 ++++----------
+ 1 file changed, 4 insertions(+), 10 deletions(-)
+
+diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
+index b065cdc513..9a7006c6e5 100644
+--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
+@@ -3422,7 +3422,10 @@ esxDomainSetAutostart(virDomainPtr domain, int autostart)
+     if (esxVI_AutoStartPowerInfo_Alloc(&newPowerInfo) < 0 ||
+         esxVI_Int_Alloc(&newPowerInfo->startOrder) < 0 ||
+         esxVI_Int_Alloc(&newPowerInfo->startDelay) < 0 ||
+-        esxVI_Int_Alloc(&newPowerInfo->stopDelay) < 0) {
+        esxVI_Int_Alloc(&newPowerInfo->stopDelay) < 0 ||
+        esxVI_AutoStartPowerInfo_AppendToList(&spec->powerInfo,
+                                              newPowerInfo) < 0) {
+        esxVI_AutoStartPowerInfo_Free(&newPowerInfo);
+         goto cleanup;
+     }
+ 
+@@ -3434,13 +3437,6 @@ esxDomainSetAutostart(virDomainPtr domain, int autostart)
+     newPowerInfo->stopDelay->value = -1; /* use system default */
+     newPowerInfo->stopAction = (char *)"none";
+ 
+-    if (esxVI_AutoStartPowerInfo_AppendToList(&spec->powerInfo,
+-                                              newPowerInfo) < 0) {
+-        goto cleanup;
+-    }
+-
+-    newPowerInfo = NULL;
+-
+     if (esxVI_ReconfigureAutostart
+           (priv->primary,
+            priv->primary->hostSystem->configManager->autoStartManager,
+@@ -3462,8 +3458,6 @@ esxDomainSetAutostart(virDomainPtr domain, int autostart)
+     esxVI_AutoStartDefaults_Free(&defaults);
+     esxVI_AutoStartPowerInfo_Free(&powerInfoList);
+ 
+-    esxVI_AutoStartPowerInfo_Free(&newPowerInfo);
+-
+     return result;
+ }
+ 
@@ -1,53 +0,0 @@
-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,6 +1,7 @@
+From 8d6ab7976fa691763fc05a154f2bab865d435b00 Mon Sep 17 00:00:00 2001
 From: Jiri Denemark <jdenemar@redhat.com>
 Date: Fri, 5 Apr 2019 11:33:32 +0200
-Subject: [PATCH] cpu_x86: Do not cache microcode version
+Subject: [PATCH 1/4] cpu_x86: Do not cache microcode version
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -20,10 +21,10 @@ Reviewed-by: Ján Tomko <jtomko@redhat.com>
 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
+index b2398c5ad2..38cab15c59 100644
 --- a/src/cpu/cpu_x86.c
 +++ b/src/cpu/cpu_x86.c
-@@ -165,7 +165,6 @@ struct _virCPUx86Map {
+@@ -154,7 +154,6 @@ struct _virCPUx86Map {
 };
 
 static virCPUx86MapPtr cpuMap;
@@ -31,7 +32,7 @@ index d3a88da21d..470de83a87 100644
 
 int virCPUx86DriverOnceInit(void);
 VIR_ONCE_GLOBAL_INIT(virCPUx86Driver);
-@@ -1332,8 +1331,6 @@ virCPUx86DriverOnceInit(void)
+@@ -1413,8 +1412,6 @@ virCPUx86DriverOnceInit(void)
     if (!(cpuMap = virCPUx86LoadMap()))
         return -1;
 
@@ -40,7 +41,7 @@ index d3a88da21d..470de83a87 100644
     return 0;
 }
 
-@@ -2373,7 +2370,7 @@ virCPUx86GetHost(virCPUDefPtr cpu,
+@@ -2454,7 +2451,7 @@ virCPUx86GetHost(virCPUDefPtr cpu,
         goto cleanup;
 
     ret = x86DecodeCPUData(cpu, cpuData, models);
@@ -49,3 +50,6 @@ index d3a88da21d..470de83a87 100644
 
  cleanup:
     virCPUx86DataFree(cpuData);
+-- 
+2.21.0
+
@@ -1,50 +0,0 @@
-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,6 +1,7 @@
+From cb6bcb0312a33a0b6a48d0ee1f368c9080e4a13d Mon Sep 17 00:00:00 2001
 From: Jiri Denemark <jdenemar@redhat.com>
 Date: Fri, 12 Apr 2019 21:21:05 +0200
-Subject: [PATCH] qemu: Don't cache microcode version
+Subject: [PATCH 2/4] qemu: Don't cache microcode version
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -17,6 +18,17 @@ correct microcode version while still using the old host CPU model
 Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
 Reviewed-by: Ján Tomko <jtomko@redhat.com>
 (cherry picked from commit 673c62a3b7855a0685d8f116e227c402720b9ee9)
+
+CVE-2018-12126, CVE-2018-12127, CVE-2018-12130
+
+Conflicts:
+	src/qemu/qemu_capabilities.c
+            - virQEMUCapsCacheLookupByArch refactoring (commits
+              7948ad4129a and 1a3de67001c) are missing
+            - commit a7424faff0f "Force QMP capability probing" is
+              missing downstream
+
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
 ---
 src/qemu/qemu_capabilities.c | 12 ++++++++----
 src/qemu/qemu_capabilities.h |  3 +--
@@ -25,19 +37,19 @@ Reviewed-by: Ján Tomko <jtomko@redhat.com>
 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
+index b5eb8cf46a..17eb6579bf 100644
 --- a/src/qemu/qemu_capabilities.c
 +++ b/src/qemu/qemu_capabilities.c
-@@ -4487,7 +4487,7 @@ virQEMUCapsNewData(const char *binary,
+@@ -5343,7 +5343,7 @@ virQEMUCapsNewData(const char *binary,
                                            priv->libDir,
                                            priv->runUid,
                                            priv->runGid,
 -                                           priv->microcodeVersion,
 +                                           virHostCPUGetMicrocodeVersion(),
-                                            priv->kernelVersion);
+                                            priv->kernelVersion,
+                                            false);
 }
- 
-@@ -4570,8 +4570,7 @@ virFileCachePtr
+@@ -5427,8 +5427,7 @@ virFileCachePtr
 virQEMUCapsCacheNew(const char *libDir,
                     const char *cacheDir,
                     uid_t runUid,
@@ -47,15 +59,15 @@ index b48bcbebee..e5b1c90253 100644
 {
     char *capsCacheDir = NULL;
     virFileCachePtr cache = NULL;
-@@ -4595,7 +4594,6 @@ virQEMUCapsCacheNew(const char *libDir,
+@@ -5452,7 +5451,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
+         virAsprintf(&priv->kernelVersion, "%s %s", uts.release, uts.version) < 0)
+@@ -5473,8 +5471,11 @@ virQEMUCapsPtr
 virQEMUCapsCacheLookup(virFileCachePtr cache,
                        const char *binary)
 {
@@ -67,28 +79,25 @@ index b48bcbebee..e5b1c90253 100644
     ret = virFileCacheLookup(cache, binary);
 
     VIR_DEBUG("Returning caps %p for %s", ret, binary);
-@@ -4672,6 +4673,7 @@ virQEMUCapsPtr
+@@ -5520,10 +5521,13 @@ 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;
+     virArch target;
+     struct virQEMUCapsSearchData data = { .arch = arch };
 
 +    priv->microcodeVersion = virHostCPUGetMicrocodeVersion();
 +
-     for (i = 0; i < ARRAY_CARDINALITY(binaryFilters); i++) {
-         for (j = 0; j < ARRAY_CARDINALITY(archs); j++) {
-             struct virQEMUCapsSearchData data = {
+     ret = virFileCacheLookupByFunc(cache, virQEMUCapsCompareArch, &data);
+     if (!ret) {
+         /* If the first attempt at finding capabilities has failed, try
 diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index ba84052bca..a6a655ac0f 100644
+index c2ec2be193..7fd51f5fa0 100644
 --- a/src/qemu/qemu_capabilities.h
 +++ b/src/qemu/qemu_capabilities.h
-@@ -587,8 +587,7 @@ void virQEMUCapsFilterByMachineType(virQEMUCapsPtr qemuCaps,
+@@ -524,8 +524,7 @@ void virQEMUCapsFilterByMachineType(virQEMUCapsPtr qemuCaps,
 virFileCachePtr virQEMUCapsCacheNew(const char *libDir,
                                     const char *cacheDir,
                                     uid_t uid,
@@ -99,10 +108,10 @@ index ba84052bca..a6a655ac0f 100644
                                       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
+index 96454c17c0..bb38904090 100644
 --- a/src/qemu/qemu_driver.c
 +++ b/src/qemu/qemu_driver.c
-@@ -585,8 +585,6 @@ qemuStateInitialize(bool privileged,
+@@ -610,8 +610,6 @@ qemuStateInitialize(bool privileged,
     char *hugepagePath = NULL;
     char *memoryBackingPath = NULL;
     size_t i;
@@ -111,7 +120,7 @@ index 36426cd65a..75d31efd14 100644
 
     if (VIR_ALLOC(qemu_driver) < 0)
         return -1;
-@@ -809,15 +807,10 @@ qemuStateInitialize(bool privileged,
+@@ -831,15 +829,10 @@ qemuStateInitialize(bool privileged,
         run_gid = cfg->group;
     }
 
@@ -129,10 +138,10 @@ index 36426cd65a..75d31efd14 100644
         goto error;
 
 diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
-index 1736bad032..e30c0599ad 100644
+index f8182033fc..2c7124bf26 100644
 --- a/tests/testutilsqemu.c
 +++ b/tests/testutilsqemu.c
-@@ -740,7 +740,7 @@ int qemuTestDriverInit(virQEMUDriver *driver)
+@@ -603,7 +603,7 @@ int qemuTestDriverInit(virQEMUDriver *driver)
 
     /* Using /dev/null for libDir and cacheDir automatically produces errors
      * upon attempt to use any of them */
@@ -141,3 +150,6 @@ index 1736bad032..e30c0599ad 100644
     if (!driver->qemuCapsCache)
         goto error;
 
+-- 
+2.21.0
+
@@ -1,52 +0,0 @@
-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,24 +1,33 @@
+From 36151b10d3e1f8f92f4ad6b8200ce5355b7f96f0 Mon Sep 17 00:00:00 2001
 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
+Date: Fri, 5 Apr 2019 11:19:30 +0200
+Subject: [PATCH 3/4] cputest: Add data for Intel(R) Xeon(R) CPU E3-1225 v5
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
 Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
 (cherry picked from commit 5cd9db3ac11e88846cbcf95fad9f6fae9d880dee)
+
+CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091
+
+Conflicts:
+	tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
+	tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
+            - intel-pt feature is missing
+
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
 ---
 tests/cputest.c                               |   1 +
 .../x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml |   7 +
 .../x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml  |   8 +
- .../x86_64-cpuid-Xeon-E3-1225-v5-guest.xml    |  28 +
- .../x86_64-cpuid-Xeon-E3-1225-v5-host.xml     |  29 +
+ .../x86_64-cpuid-Xeon-E3-1225-v5-guest.xml    |  27 +
+ .../x86_64-cpuid-Xeon-E3-1225-v5-host.xml     |  28 +
 .../x86_64-cpuid-Xeon-E3-1225-v5-json.xml     |  11 +
 .../x86_64-cpuid-Xeon-E3-1225-v5.json         | 652 ++++++++++++++++++
 .../x86_64-cpuid-Xeon-E3-1225-v5.sig          |   4 +
 .../x86_64-cpuid-Xeon-E3-1225-v5.xml          |  47 ++
- 9 files changed, 787 insertions(+)
+ 9 files changed, 785 insertions(+)
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
 create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
@@ -29,10 +38,10 @@ Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
 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
+index 1e79edbef7..2df1d28e39 100644
 --- a/tests/cputest.c
 +++ b/tests/cputest.c
-@@ -1184,6 +1184,7 @@ mymain(void)
+@@ -1189,6 +1189,7 @@ mymain(void)
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Phenom-B95", JSON_HOST);
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Ryzen-7-1800X-Eight-Core", JSON_HOST);
     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-5110", JSON_NONE);
@@ -69,10 +78,10 @@ index 0000000000..0deca9fba6
 +</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
+index 0000000000..141c01c841
 --- /dev/null
 +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-@@ -0,0 +1,28 @@
+@@ -0,0 +1,27 @@
 +<cpu mode='custom' match='exact'>
 +  <model fallback='forbid'>Skylake-Client-IBRS</model>
 +  <vendor>Intel</vendor>
@@ -94,7 +103,6 @@ index 0000000000..70a0fc3286
 +  <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'/>
@@ -103,10 +111,10 @@ index 0000000000..70a0fc3286
 +</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
+index 0000000000..53bfc9728d
 --- /dev/null
 +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-@@ -0,0 +1,29 @@
+@@ -0,0 +1,28 @@
 +<cpu>
 +  <arch>x86_64</arch>
 +  <model>Skylake-Client-IBRS</model>
@@ -129,7 +137,6 @@ index 0000000000..bbdfb6aa61
 +  <feature name='osxsave'/>
 +  <feature name='tsc_adjust'/>
 +  <feature name='clflushopt'/>
-+  <feature name='intel-pt'/>
 +  <feature name='stibp'/>
 +  <feature name='ssbd'/>
 +  <feature name='xsaves'/>
@@ -874,3 +881,6 @@ index 0000000000..437429d61d
 +  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000ce4' ebx='0x00000e74' ecx='0x00000064' edx='0x00000000'/>
 +  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000ce4' ebx='0x00000e74' ecx='0x00000064' edx='0x00000000'/>
 +</cpudata>
+-- 
+2.21.0
+
@@ -1,30 +0,0 @@
-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++) {
@@ -1,11 +1,12 @@
+From 7bde733e906a9eb513448fd58201a333a1793811 Mon Sep 17 00:00:00 2001
 From: Jiri Denemark <jdenemar@redhat.com>
-Date: Tue, 9 Apr 2019 12:35:52 +0200
-Subject: [PATCH] cpu_map: Define md-clear CPUID bit
+Date: Fri, 5 Apr 2019 15:11:20 +0200
+Subject: [PATCH 4/4] cpu_map: Define md-clear CPUID bit
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

-CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091
+CVE-2018-12126, CVE-2018-12127, CVE-2018-12130

 The bit is set when microcode provides the mechanism to invoke a flush
 of various exploitable CPU buffers by invoking the VERW instruction.
@@ -16,33 +17,40 @@ 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
+	src/cpu_map/x86_features.xml
+            - no CPU map split downstream
+
+	tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
+	tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
            - test data missing downstream

+	tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
+	tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
+            - intel-pt feature is missing downstream
+
 Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
 ---
- src/cpu_map/x86_features.xml                               | 3 +++
+ src/cpu/cpu_map.xml                                        | 3 +++
 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml | 2 +-
 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml   | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml    | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml    | 1 +
 5 files changed, 7 insertions(+), 1 deletion(-)

-diff --git a/src/cpu_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/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
+index 96daa0f9af..250e241df9 100644
+--- a/src/cpu/cpu_map.xml
+++ b/src/cpu/cpu_map.xml
+@@ -295,6 +295,9 @@
+     <feature name='avx512-4fmaps'>
+       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000008'/>
+     </feature>
+    <feature name='md-clear'> <!-- md_clear -->
+      <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000400'/>
+    </feature>
+     <feature name='spec-ctrl'>
+       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x04000000'/>
+     </feature>
 diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
 index 0deca9fba6..74763a462b 100644
 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
@@ -57,25 +65,25 @@ index 0deca9fba6..74763a462b 100644
   <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
+index 141c01c841..3b3472742e 100644
 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
 +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-@@ -20,6 +20,7 @@
+@@ -19,6 +19,7 @@
+   <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='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
+index 53bfc9728d..df4f97417c 100644
 --- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
 +++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-@@ -21,6 +21,7 @@
+@@ -20,6 +20,7 @@
+   <feature name='osxsave'/>
   <feature name='tsc_adjust'/>
   <feature name='clflushopt'/>
-   <feature name='intel-pt'/>
 +  <feature name='md-clear'/>
   <feature name='stibp'/>
   <feature name='ssbd'/>
@@ -92,3 +100,6 @@ index 1f321db273..a5591278df 100644
   <feature policy='require' name='stibp'/>
   <feature policy='require' name='ssbd'/>
   <feature policy='require' name='pdpe1gb'/>
+-- 
+2.21.0
+
@@ -0,0 +1,56 @@
+From 4cb90fa2335b75a0fc39440853bd681955b326a4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Tue, 14 May 2019 21:09:59 +0100
+Subject: [PATCH] cputest: remove stibp flag from test data
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+stibp flag doesn't exist in this maint branch.
+
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+---
+ tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml | 1 -
+ tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml  | 1 -
+ tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml  | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
+index 3b3472742e..29c1fdb80a 100644
+--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
+@@ -20,7 +20,6 @@
+   <feature policy='require' name='tsc_adjust'/>
+   <feature policy='require' name='clflushopt'/>
+   <feature policy='require' name='md-clear'/>
+-  <feature policy='require' name='stibp'/>
+   <feature policy='require' name='ssbd'/>
+   <feature policy='require' name='xsaves'/>
+   <feature policy='require' name='pdpe1gb'/>
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
+index df4f97417c..2003ca9ef6 100644
+--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
+@@ -21,7 +21,6 @@
+   <feature name='tsc_adjust'/>
+   <feature name='clflushopt'/>
+   <feature name='md-clear'/>
+-  <feature name='stibp'/>
+   <feature name='ssbd'/>
+   <feature name='xsaves'/>
+   <feature name='pdpe1gb'/>
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
+index a5591278df..d6529c59a3 100644
+--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
+@@ -6,7 +6,6 @@
+   <feature policy='require' name='tsc_adjust'/>
+   <feature policy='require' name='clflushopt'/>
+   <feature policy='require' name='md-clear'/>
+-  <feature policy='require' name='stibp'/>
+   <feature policy='require' name='ssbd'/>
+   <feature policy='require' name='pdpe1gb'/>
+ </cpu>
+-- 
+2.21.0
+
@@ -1,7 +1,8 @@
+From 39fb5ab3125d1669344bab94ccb71bce814d9ae2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
 Date: Tue, 30 Apr 2019 17:26:13 +0100
-Subject: [PATCH] admin: reject clients unless their UID matches the current
- UID
+Subject: [PATCH 1/3] admin: reject clients unless their UID matches the
+ current UID
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -20,10 +21,10 @@ Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
 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
+index b78ff902c0..9f25813ae3 100644
 --- a/src/admin/admin_server_dispatch.c
 +++ b/src/admin/admin_server_dispatch.c
-@@ -64,6 +64,28 @@ remoteAdmClientNew(virNetServerClientPtr client ATTRIBUTE_UNUSED,
+@@ -66,6 +66,28 @@ remoteAdmClientNew(virNetServerClientPtr client ATTRIBUTE_UNUSED,
                    void *opaque)
 {
     struct daemonAdmClientPrivate *priv;
@@ -52,3 +53,6 @@ index 85e693d76c..6e3b99f97d 100644
 
     if (VIR_ALLOC(priv) < 0)
         return NULL;
+-- 
+2.21.0
+
@@ -1,6 +1,7 @@
+From 41f06e6095e17b61b2af35821d204afc5c34777c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
 Date: Tue, 30 Apr 2019 16:51:37 +0100
-Subject: [PATCH] locking: restrict sockets to mode 0600
+Subject: [PATCH 2/3] locking: restrict sockets to mode 0600
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -45,3 +46,6 @@ index 45e0f20235..d701b27516 100644
 
 [Install]
 WantedBy=sockets.target
+-- 
+2.21.0
+
@@ -1,6 +1,7 @@
+From f0e014133104cdb5af5c7d96a7aa6dc0f1bbb03c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
 Date: Tue, 30 Apr 2019 17:27:41 +0100
-Subject: [PATCH] logging: restrict sockets to mode 0600
+Subject: [PATCH 3/3] logging: restrict sockets to mode 0600
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -45,3 +46,6 @@ index 22b9360c8d..ae48cdab9a 100644
 
 [Install]
 WantedBy=sockets.target
+-- 
+2.21.0
+
@@ -1,81 +0,0 @@
-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,
- 
@@ -1,33 +0,0 @@
-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;
@@ -1,31 +0,0 @@
-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;
@@ -1,39 +0,0 @@
-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;
@@ -1,32 +0,0 @@
-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);
@@ -1,42 +0,0 @@
-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,
- 
@@ -1,59 +0,0 @@
-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;
@@ -1,35 +0,0 @@
-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 +1 @@
-SHA512 (libvirt-5.1.0.tar.xz) = ca64d7be683614bdeb20a8865655fe80f911cf13c00aed2334db3a2e4131e1dd6fe5e9663a24e6f82161ad5aa53f1a2637cd21730eed46e4764b7eebced94f3f
+SHA512 (libvirt-4.1.0.tar.xz) = 62d1a228adf3270cc6defe3cbf92dac8c4ce2c434c4d97219571ccef799a4f6304cfd1ba9938338356641285f53ac71145d7b398523021c5ea1dc8e3d49cf894
Author	SHA1	Message	Date
Daniel P. Berrangé	6aad33f3cc	Fix systemd socket permissions (CVE-2019-10132) Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2019-05-21 17:07:31 +01:00
Daniel P. Berrangé	5b6591ed7d	Remove mistakenly added stibp feature from tests Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2019-05-14 21:21:10 +01:00
Daniel P. Berrangé	71c382a378	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 20:26:55 +01:00
Cole Robinson	3ac26c9827	Fix LookupBy APIs hash races (bz #1621471 ) ESX: crash when user sets autostart flags to a domain (bz #1611921)	2018-08-23 14:56:26 -04:00
Cole Robinson	d8f5f4e2e9	Fix virtlockd-admin.socket syntax (bz #1586239 ) nwfilter: increase pcap buffer size to be compatible with TPACKET_V3 (bz #1547237)	2018-07-03 12:24:47 -04:00
Daniel P. Berrangé	7fa7c37eee	Adapt to changed wireshark plugin install directory Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2018-06-18 19:03:25 +01:00
Daniel P. Berrangé	398721ffd4	Add new CPU features for speculative store bypass (CVE-2018-3639) Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2018-06-18 18:51:41 +01:00
Daniel P. Berrangé	f6736a34a2	Fix systemd macro argument with line continuations (rhbz#1558648) Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2018-03-21 10:46:59 +00:00
Daniel P. Berrangé	aa2d30880a	Upload 4.1.0 sources Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2018-03-05 14:07:14 +00:00
Daniel P. Berrangé	b6cdf32170	Rebase to version 4.1.0 Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>	2018-03-05 14:07:14 +00:00