Add patches

Fix getVersion() after installing qemu (bz #1000116)
Fix autosocket setup with qemu:///session (bz #1044561, bz #1105274)
Ignore storage volumes with non-ascii in names (bz #1066564)
Don't generate invalid system nodedev XML (bz #1184131)
Fix vhost-user XML (bz #1190842)
Fix crash via race when unrefing rpc identity object (bz #1203030)
Fix domcapabilities failure with ppc64le (bz #1209948)
Fix snapshot-revert with cpu host-passthrough (bz #1030793)
Fix starting VM with emulator pinning (bz #1214434)
Fix virDomainBlockCopyRebase selinux failure (bz #1214846)
Add {Haswell,Broadwell}-noTSX CPU models (bz #1182650)
Report original error when QMP probing fails (bz #1178054)
Don't lose VMs on libvirtd restart if qemu is uninstalled (bz #1099847)
Ignore storage volumes that libvirt can't open (bz #1103308)

.gitignore

@@ -2,4 +2,4 @@
 *.rpm
 i686
 x86_64
-libvirt-*.tar.xz
+libvirt-*.tar.gz

0001-Cpu-Add-support-for-Power-LE-Architecture.patch

@@ -0,0 +1,206 @@
+From: Prerna Saxena <prerna@linux.vnet.ibm.com>
+Date: Tue, 4 Nov 2014 22:51:26 +0530
+Subject: [PATCH] Cpu: Add support for Power LE Architecture.
+
+This adds support for PowerPC Little Endian architecture.,
+and allows libvirt to spawn VMs based on 'ppc64le' architecture.
+
+Signed-off-by: Pradipta Kr. Banerjee <bpradip@in.ibm.com>
+Signed-off-by: Prerna Saxena <prerna@linux.vnet.ibm.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit da636d83dc6b1d070a705786b4daef8644eaca13)
+---
+ src/conf/domain_conf.c       |  2 +-
+ src/cpu/cpu_powerpc.c        |  2 +-
+ src/qemu/qemu_capabilities.c |  6 +++---
+ src/qemu/qemu_command.c      | 22 +++++++++++-----------
+ src/qemu/qemu_domain.c       |  1 +
+ src/util/virarch.h           |  3 +++
+ 6 files changed, 20 insertions(+), 16 deletions(-)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index cfdf66c..8aca289 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -9867,7 +9867,7 @@ virDomainVideoDefaultType(const virDomainDef *def)
+             (STREQ(def->os.type, "xen") ||
+              STREQ(def->os.type, "linux")))
+             return VIR_DOMAIN_VIDEO_TYPE_XEN;
+-        else if (def->os.arch == VIR_ARCH_PPC64)
++        else if ARCH_IS_PPC64(def->os.arch)
+             return VIR_DOMAIN_VIDEO_TYPE_VGA;
+         else
+             return VIR_DOMAIN_VIDEO_TYPE_CIRRUS;
+diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c
+index 67cb9ff..d591c18 100644
+--- a/src/cpu/cpu_powerpc.c
++++ b/src/cpu/cpu_powerpc.c
+@@ -38,7 +38,7 @@
+ 
+ VIR_LOG_INIT("cpu.cpu_powerpc");
+ 
+-static const virArch archs[] = { VIR_ARCH_PPC64 };
++static const virArch archs[] = { VIR_ARCH_PPC64, VIR_ARCH_PPC64LE };
+ 
+ struct ppc_vendor {
+     char *name;
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index be4d01f..34d753c 100644
+--- a/src/qemu/qemu_capabilities.c
++++ b/src/qemu/qemu_capabilities.c
+@@ -632,7 +632,7 @@ virQEMUCapsProbeCPUModels(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid)
+     if (qemuCaps->arch == VIR_ARCH_I686 ||
+         qemuCaps->arch == VIR_ARCH_X86_64) {
+         parse = virQEMUCapsParseX86Models;
+-    } else if (qemuCaps->arch == VIR_ARCH_PPC64) {
++    } else if ARCH_IS_PPC64(qemuCaps->arch) {
+         parse = virQEMUCapsParsePPCModels;
+     } else {
+         VIR_DEBUG("don't know how to parse %s CPU models",
+@@ -2018,7 +2018,7 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps,
+         return true;
+ 
+     if (def->os.arch == VIR_ARCH_PPC ||
+-        def->os.arch == VIR_ARCH_PPC64) {
++        ARCH_IS_PPC64(def->os.arch)) {
+         /*
+          * Usage of pci.0 naming:
+          *
+@@ -3600,7 +3600,7 @@ virQEMUCapsSupportsChardev(virDomainDefPtr def,
+         !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE))
+         return false;
+ 
+-    if ((def->os.arch == VIR_ARCH_PPC) || (def->os.arch == VIR_ARCH_PPC64)) {
++    if ((def->os.arch == VIR_ARCH_PPC) || ARCH_IS_PPC64(def->os.arch)) {
+         /* only pseries need -device spapr-vty with -chardev */
+         return (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&
+                 chr->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO);
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index aeb4eec..c5c48bf 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -713,7 +713,7 @@ qemuSetSCSIControllerModel(virDomainDefPtr def,
+             return -1;
+         }
+     } else {
+-        if ((def->os.arch == VIR_ARCH_PPC64) &&
++        if (ARCH_IS_PPC64(def->os.arch) &&
+             STRPREFIX(def->os.machine, "pseries")) {
+             *model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI;
+         } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_LSI)) {
+@@ -1260,7 +1260,7 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def,
+ 
+     for (i = 0; i < def->nserials; i++) {
+         if (def->serials[i]->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&
+-            (def->os.arch == VIR_ARCH_PPC64) &&
++            ARCH_IS_PPC64(def->os.arch) &&
+             STRPREFIX(def->os.machine, "pseries"))
+             def->serials[i]->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO;
+         if (qemuAssignSpaprVIOAddress(def, &def->serials[i]->info,
+@@ -1269,7 +1269,7 @@ int qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def,
+     }
+ 
+     if (def->nvram) {
+-        if (def->os.arch == VIR_ARCH_PPC64 &&
++        if (ARCH_IS_PPC64(def->os.arch) &&
+             STRPREFIX(def->os.machine, "pseries"))
+             def->nvram->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO;
+         if (qemuAssignSpaprVIOAddress(def, &def->nvram->info,
+@@ -4191,7 +4191,7 @@ qemuBuildUSBControllerDevStr(virDomainDefPtr domainDef,
+     model = def->model;
+ 
+     if (model == -1) {
+-        if (domainDef->os.arch == VIR_ARCH_PPC64)
++        if ARCH_IS_PPC64(domainDef->os.arch)
+             model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PCI_OHCI;
+         else
+             model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI;
+@@ -8445,7 +8445,7 @@ qemuBuildCommandLine(virConnectPtr conn,
+                            !qemuDomainMachineIsQ35(def) &&
+                            (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI) ||
+                             (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_OHCI) &&
+-                             def->os.arch == VIR_ARCH_PPC64))) {
++                             ARCH_IS_PPC64(def->os.arch)))) {
+                     if (usblegacy) {
+                         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                                        _("Multiple legacy USB controllers are "
+@@ -9643,7 +9643,7 @@ qemuBuildCommandLine(virConnectPtr conn,
+     }
+ 
+     if (def->nvram) {
+-        if (def->os.arch == VIR_ARCH_PPC64 &&
++        if (ARCH_IS_PPC64(def->os.arch) &&
+             STRPREFIX(def->os.machine, "pseries")) {
+             if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_NVRAM)) {
+                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+@@ -9761,7 +9761,7 @@ qemuBuildSerialChrDeviceStr(char **deviceStr,
+ {
+     virBuffer cmd = VIR_BUFFER_INITIALIZER;
+ 
+-    if ((arch == VIR_ARCH_PPC64) && STRPREFIX(machine, "pseries")) {
++    if (ARCH_IS_PPC64(arch) && STRPREFIX(machine, "pseries")) {
+         if (serial->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&
+             serial->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) {
+             virBufferAsprintf(&cmd, "spapr-vty,chardev=char%s",
+@@ -10183,7 +10183,7 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt,
+     if (VIR_ALLOC(def->src) < 0)
+         goto error;
+ 
+-    if (((dom->os.arch == VIR_ARCH_PPC64) &&
++    if ((ARCH_IS_PPC64(dom->os.arch) &&
+         dom->os.machine && STRPREFIX(dom->os.machine, "pseries")))
+         def->bus = VIR_DOMAIN_DISK_BUS_SCSI;
+     else
+@@ -10276,7 +10276,7 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt,
+         } else if (STREQ(keywords[i], "if")) {
+             if (STREQ(values[i], "ide")) {
+                 def->bus = VIR_DOMAIN_DISK_BUS_IDE;
+-                if (((dom->os.arch == VIR_ARCH_PPC64) &&
++                if ((ARCH_IS_PPC64(dom->os.arch) &&
+                      dom->os.machine && STRPREFIX(dom->os.machine, "pseries"))) {
+                     virReportError(VIR_ERR_INTERNAL_ERROR,
+                                    _("pseries systems do not support ide devices '%s'"), val);
+@@ -11521,7 +11521,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
+             }
+             if (STREQ(arg, "-cdrom")) {
+                 disk->device = VIR_DOMAIN_DISK_DEVICE_CDROM;
+-                if (((def->os.arch == VIR_ARCH_PPC64) &&
++                if ((ARCH_IS_PPC64(def->os.arch) &&
+                     def->os.machine && STRPREFIX(def->os.machine, "pseries")))
+                     disk->bus = VIR_DOMAIN_DISK_BUS_SCSI;
+                 if (VIR_STRDUP(disk->dst, "hdc") < 0)
+@@ -11537,7 +11537,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
+                         disk->bus = VIR_DOMAIN_DISK_BUS_IDE;
+                     else
+                         disk->bus = VIR_DOMAIN_DISK_BUS_SCSI;
+-                   if (((def->os.arch == VIR_ARCH_PPC64) &&
++                   if ((ARCH_IS_PPC64(def->os.arch) &&
+                        def->os.machine && STRPREFIX(def->os.machine, "pseries")))
+                        disk->bus = VIR_DOMAIN_DISK_BUS_SCSI;
+                 }
+diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
+index bec7cf2..48e8acf 100644
+--- a/src/qemu/qemu_domain.c
++++ b/src/qemu/qemu_domain.c
+@@ -980,6 +980,7 @@ qemuDomainDefPostParse(virDomainDefPtr def,
+        break;
+ 
+     case VIR_ARCH_PPC64:
++    case VIR_ARCH_PPC64LE:
+         addPCIRoot = true;
+         addDefaultUSBKBD = true;
+         addDefaultUSBMouse = true;
+diff --git a/src/util/virarch.h b/src/util/virarch.h
+index d395e58..3206ce2 100644
+--- a/src/util/virarch.h
++++ b/src/util/virarch.h
+@@ -79,6 +79,9 @@ typedef enum {
+                              (arch) == VIR_ARCH_PPC64LE ||\
+                              (arch) == VIR_ARCH_PPCEMB)
+ 
++# define ARCH_IS_PPC64(arch)  ((arch) == VIR_ARCH_PPC64 ||\
++                               (arch) == VIR_ARCH_PPC64LE)
++
+ # define ARCH_IS_ARM(arch)  ((arch) == VIR_ARCH_ARMV6L ||\
+                              (arch) == VIR_ARCH_ARMV7L ||\
+                              (arch) == VIR_ARCH_ARMV7B ||\

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

@@ -1,32 +0,0 @@
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Mon, 21 May 2018 23:05:07 +0100
-Subject: [PATCH] cpu: define the 'ssbd' CPUID feature bit (CVE-2018-3639)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-New microcode introduces the "Speculative Store Bypass Disable"
-CPUID feature bit. This needs to be exposed to guest OS to allow
-them to protect against CVE-2018-3639.
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 1dbca2eccad58d91a5fd33962854f1a653638182)
----
- src/cpu/cpu_map.xml | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index 00a43b172c..245aec3309 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -298,6 +298,9 @@
-     <feature name='spec-ctrl'>
-       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x04000000'/>
-     </feature>
-+    <feature name='ssbd'>
-+      <cpuid eax_in='0x07' ecx_in='0x00' edx='0x80000000'/>
-+    </feature>
- 
-     <!-- Processor Extended State Enumeration sub leaf 1 -->
-     <feature name='xsaveopt'>

0002-PowerPC-Add-support-for-launching-VM-in-compat-mode.patch

@@ -0,0 +1,99 @@
+From: Prerna Saxena <prerna@linux.vnet.ibm.com>
+Date: Tue, 4 Nov 2014 22:52:44 +0530
+Subject: [PATCH] PowerPC : Add support for launching VM in 'compat' mode.
+
+PowerISA allows processors to run VMs in binary compatibility ("compat")
+mode supporting an older version of ISA. QEMU has recently added support to
+explicitly denote a VM running in compatibility mode through commit 6d9412ea
+& 8dfa3a5e85. Now, a "compat" mode VM can be run by invoking this qemu
+commandline on a POWER8 host:  -cpu host,compat=power7.
+
+This patch allows libvirt to exploit cpu mode 'host-model' to describe this
+new mode for PowerKVM guests. For example, when a user wants to request a
+power7 vm to run in compatibility mode on a Power8 host, this can be
+described in XML as follows :
+
+  <cpu mode='host-model'>
+    <model>power7</model>
+  </cpu>
+
+Signed-off-by: Prerna Saxena <prerna@linux.vnet.ibm.com>
+Signed-off-by: Li Zhang <zhlcindy@linux.vnet.ibm.com>
+Signed-off-by: Pradipta Kr. Banerjee <bpradip@in.ibm.com>
+Acked-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit addce06c9221f948072cd222b56ea9c3f70ec066)
+---
+ src/conf/cpu_conf.c     |  1 +
+ src/cpu/cpu_powerpc.c   | 11 ++---------
+ src/qemu/qemu_command.c | 10 +++++++++-
+ 3 files changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
+index c09c352..74f0b16 100644
+--- a/src/conf/cpu_conf.c
++++ b/src/conf/cpu_conf.c
+@@ -624,6 +624,7 @@ virCPUDefFormatBuf(virBufferPtr buf,
+         return 0;
+ 
+     formatModel = (def->mode == VIR_CPU_MODE_CUSTOM ||
++                   def->mode == VIR_CPU_MODE_HOST_MODEL ||
+                    (flags & VIR_DOMAIN_XML_UPDATE_CPU));
+     formatFallback = (def->type == VIR_CPU_TYPE_GUEST &&
+                       (def->mode == VIR_CPU_MODE_HOST_MODEL ||
+diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c
+index d591c18..4ea1835 100644
+--- a/src/cpu/cpu_powerpc.c
++++ b/src/cpu/cpu_powerpc.c
+@@ -562,8 +562,8 @@ ppcUpdate(virCPUDefPtr guest,
+ static virCPUDefPtr
+ ppcBaseline(virCPUDefPtr *cpus,
+             unsigned int ncpus,
+-            const char **models,
+-            unsigned int nmodels,
++            const char **models ATTRIBUTE_UNUSED,
++            unsigned int nmodels ATTRIBUTE_UNUSED,
+             unsigned int flags)
+ {
+     struct ppc_map *map = NULL;
+@@ -583,13 +583,6 @@ ppcBaseline(virCPUDefPtr *cpus,
+         goto error;
+     }
+ 
+-    if (!cpuModelIsAllowed(model->name, models, nmodels)) {
+-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+-                        _("CPU model %s is not supported by hypervisor"),
+-                        model->name);
+-        goto error;
+-    }
+-
+     for (i = 0; i < ncpus; i++) {
+         const struct ppc_vendor *vnd;
+ 
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index c5c48bf..423692e 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -6217,7 +6217,9 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver,
+         *hasHwVirt = hasSVM > 0 ? true : false;
+     }
+ 
+-    if (cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH) {
++    if ((cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH) ||
++        ((cpu->mode == VIR_CPU_MODE_HOST_MODEL) &&
++          ARCH_IS_PPC64(def->os.arch))) {
+         const char *mode = virCPUModeTypeToString(cpu->mode);
+         if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_HOST)) {
+             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+@@ -6232,6 +6234,12 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver,
+             goto cleanup;
+         }
+         virBufferAddLit(buf, "host");
++
++        if (ARCH_IS_PPC64(def->os.arch) &&
++            cpu->mode == VIR_CPU_MODE_HOST_MODEL) {
++            virBufferAsprintf(buf, ",compat=%s", def->cpu->model);
++        }
++
+     } else {
+         if (VIR_ALLOC(guest) < 0)
+             goto cleanup;

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

@@ -1,65 +0,0 @@
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Mon, 5 Mar 2018 12:46:16 +0000
-Subject: [PATCH] tests: force use of "NORMAL" TLS priority in test suite
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When generating certificates we rely on GNUTLS' built-in default setup
-for the ciphers used in the certs. We then currently run with the distro
-specific TLS priority setup which can be much stronger, to the extent
-that the certificates we generate are considered untrustworthy. We don't
-care about the quality of the ciphers we use in the test suite, so just
-force the priority to "NORMAL" which should ensure our certs are
-accepted by GNUTLS.
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
----
- tests/virnettlscontexttest.c | 4 ++--
- tests/virnettlssessiontest.c | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c
-index 089c10e964..86647f3014 100644
---- a/tests/virnettlscontexttest.c
-+++ b/tests/virnettlscontexttest.c
-@@ -72,7 +72,7 @@ static int testTLSContextInit(const void *opaque)
-                                          data->crt,
-                                          KEYFILE,
-                                          NULL,
--                                         NULL,
-+                                         "NORMAL",
-                                          true,
-                                          true);
-     } else {
-@@ -80,7 +80,7 @@ static int testTLSContextInit(const void *opaque)
-                                          NULL,
-                                          data->crt,
-                                          KEYFILE,
--                                         NULL,
-+                                         "NORMAL",
-                                          true,
-                                          true);
-     }
-diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c
-index 6d639e5b16..7e85607181 100644
---- a/tests/virnettlssessiontest.c
-+++ b/tests/virnettlssessiontest.c
-@@ -113,7 +113,7 @@ static int testTLSSessionInit(const void *opaque)
-                                            data->servercrt,
-                                            KEYFILE,
-                                            data->wildcards,
--                                           NULL,
-+                                           "NORMAL",
-                                            false,
-                                            true);
- 
-@@ -121,7 +121,7 @@ static int testTLSSessionInit(const void *opaque)
-                                            NULL,
-                                            data->clientcrt,
-                                            KEYFILE,
--                                           NULL,
-+                                           "NORMAL",
-                                            false,
-                                            true);
- 

0003-PowerPC-Improve-PVR-handling-to-fall-back-to-cpu-gen.patch

@@ -0,0 +1,92 @@
+From: Prerna Saxena <prerna@linux.vnet.ibm.com>
+Date: Tue, 4 Nov 2014 22:58:33 +0530
+Subject: [PATCH] PowerPC:Improve PVR handling to fall back to cpu generation.
+
+IBM Power processors differ uniquely across generations (such as power6,
+power7, power8). Each generation signifies a new PowerISA version
+that exhibits features unique to that generation.
+The higher 16 bits of PVR for IBM Power processors encode the CPU
+generation, while the CPU chip (sub)version is encoded in lower 16 bits.
+
+For all practical purposes of launching a VM, we care about the
+generation which the vCPU will belong to, and not specifically the chip
+version. This patch updates the libvirt PVR check to reflect this
+relationship. It allows libvirt to select the right CPU generation
+in case the exact match for a a specific CPU is not found.
+Hence, there will no longer be a need to add each PowerPC CPU model to
+cpu_map.xml; just adding entry for the matching ISA generation will
+suffice.
+
+It also contains changes to cpu_map.xml since processor generations
+as understood by QEMU compat mode go as "power6", "power7" or "power8"
+[Reference : QEMU commit 8dfa3a5e85 ]
+
+Signed-off-by: Prerna Saxena <prerna@linux.vnet.ibm.com>
+Signed-off-by: Pradipta Kr. Banerjee <bpradip@in.ibm.com>
+Signed-off-by: Anton Blanchard <anton@samba.org>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 1e911742287d964055f33ab76d53e673a9b4477f)
+---
+ src/cpu/cpu_map.xml   | 30 ++++++++++++++++++++++++++++++
+ src/cpu/cpu_powerpc.c |  8 ++++++++
+ 2 files changed, 38 insertions(+)
+
+diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
+index d181cd5..4ec49ca 100644
+--- a/src/cpu/cpu_map.xml
++++ b/src/cpu/cpu_map.xml
+@@ -637,5 +637,35 @@
+       <pvr value='0x004b0100'/>
+     </model>
+ 
++    <model name='power6'>
++      <vendor name='IBM'/>
++      <compat isa='2.05'/>
++      <pvr value='0x003e0000'/>
++    </model>
++
++    <model name='power7'>
++      <vendor name='IBM'/>
++      <compat isa='2.06'/>
++      <pvr value='0x003f0000'/>
++    </model>
++
++    <model name='power7+'>
++      <vendor name='IBM'/>
++      <compat isa='2.06B'/>
++      <pvr value='0x004a0000'/>
++    </model>
++
++    <model name='power8e'>
++      <vendor name='IBM'/>
++      <compat isa='2.07'/>
++      <pvr value='0x004b0000'/>
++    </model>
++
++    <model name='power8'>
++      <vendor name='IBM'/>
++      <compat isa='2.07'/>
++      <pvr value='0x004d0000'/>
++    </model>
++
+   </arch>
+ </cpus>
+diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c
+index 4ea1835..531868c 100644
+--- a/src/cpu/cpu_powerpc.c
++++ b/src/cpu/cpu_powerpc.c
+@@ -99,6 +99,14 @@ ppcModelFindPVR(const struct ppc_map *map,
+         model = model->next;
+     }
+ 
++    /* PowerPC Processor Version Register is interpreted as follows :
++     * Higher order 16 bits : Power ISA generation.
++     * Lower order 16 bits : CPU chip version number.
++     * If the exact CPU isnt found, return the nearest matching CPU generation
++     */
++    if (pvr & 0x0000FFFFul)
++        return ppcModelFindPVR(map, (pvr & 0xFFFF0000ul));
++
+     return NULL;
+ }
+ 

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

@@ -1,42 +0,0 @@
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Mon, 21 May 2018 23:05:08 +0100
-Subject: [PATCH] cpu: define the 'virt-ssbd' CPUID feature bit (CVE-2018-3639)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some AMD processors only support a non-architectural means of
-enabling Speculative Store Bypass Disable. To allow simplified
-handling in virtual environments, hypervisors will expose an
-architectural definition through CPUID bit 0x80000008_EBX[25].
-This needs to be exposed to guest OS running on AMD x86 hosts to
-allow them to protect against CVE-2018-3639.
-
-Note that since this CPUID bit won't be present in the host CPUID
-results on physical hosts, it will not be enabled automatically
-in guests configured with "host-model" CPU unless using QEMU
-version >= 2.9.0. Thus for older versions of QEMU, this feature
-must be manually enabled using policy=force. Guests using the
-"host-passthrough" CPU mode do not need special handling.
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 9267342206ce17f6933d57a3128cdc504d5945c9)
----
- src/cpu/cpu_map.xml | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index 245aec3309..96daa0f9af 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -433,6 +433,9 @@
-     <feature name='ibpb'>
-       <cpuid eax_in='0x80000008' ebx='0x00001000'/>
-     </feature>
-+    <feature name='virt-ssbd'>
-+      <cpuid eax_in='0x80000008' ebx='0x02000000'/>
-+    </feature>
- 
-     <!-- models -->
-     <model name='486'>

0004-docs-Add-documentation-for-compat-mode.patch

@@ -0,0 +1,41 @@
+From: Prerna Saxena <prerna@linux.vnet.ibm.com>
+Date: Tue, 4 Nov 2014 23:00:36 +0530
+Subject: [PATCH] docs: Add documentation for compat mode.
+
+Add documentation to explain how compat-mode can be invoked with libvirt
+running on PowerPC architecture.
+It also mentions that this change is available libvirt 1.2.11 onwards.
+
+Signed-off-by: Prerna Saxena <prerna@linux.vnet.ibm.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 9265fd19b68d787e478f5e490524da794965a5f1)
+---
+ docs/formatdomain.html.in | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
+index 12172a4..6c64230 100644
+--- a/docs/formatdomain.html.in
++++ b/docs/formatdomain.html.in
+@@ -1047,7 +1047,20 @@
+           (such as CPUID level) that don't work. Until these issues are fixed,
+           it's a good idea to avoid using <code>host-model</code> and use
+           <code>custom</code> mode with just the CPU model from host
+-          capabilities XML.</dd>
++          capabilities XML.
++          <span class="since">(Since 1.2.11)</span>. PowerISA allows
++          processors to run VMs in binary compatibility mode supporting an
++          older version of ISA.  Libvirt on PowerPC architecture uses the
++          <code>host-model</code> to signify a guest mode CPU running in
++          binary compatibility mode. Example:
++          When a user needs a power7 VM to run in compatibility mode
++          on a Power8 host, this can be described in XML as follows :
++<pre>
++  &lt;cpu mode='host-model'&gt;
++    &lt;model&gt;power7&lt;/model&gt;
++  &lt;/cpu&gt;
++  ...</pre>
++          </dd>
+           <dt><code>host-passthrough</code></dt>
+           <dd>With this mode, the CPU visible to the guest should be exactly
+           the same as the host CPU even in the aspects that libvirt does not

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

@@ -1,31 +0,0 @@
-From: Jim Fehlig <jfehlig@suse.com>
-Date: Wed, 14 Mar 2018 16:42:39 -0600
-Subject: [PATCH] lockd: fix typo in virtlockd-admin.socket
-
-Commit ce7ae55ea1 introduced a typo in virtlockd-admin socket file
-
-/usr/lib/systemd/system/virtlockd-admin.socket:7: Unknown lvalue
-'Server' in section 'Socket'
-
-Change 'Server' to 'Service'.
-
-Signed-off-by: Jim Fehlig <jfehlig@suse.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
----
- src/locking/virtlockd-admin.socket.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/locking/virtlockd-admin.socket.in b/src/locking/virtlockd-admin.socket.in
-index 1fa0a3dc33..2a7500f3d0 100644
---- a/src/locking/virtlockd-admin.socket.in
-+++ b/src/locking/virtlockd-admin.socket.in
-@@ -4,7 +4,7 @@ Before=libvirtd.service
- 
- [Socket]
- ListenStream=@localstatedir@/run/libvirt/virtlockd-admin-sock
--Server=virtlockd.service
-+Service=virtlockd.service
- 
- [Install]
- WantedBy=sockets.target

0005-Test-Add-a-testcase-for-PowerPC-compat-mode-cpu-spec.patch

@@ -0,0 +1,71 @@
+From: Prerna Saxena <prerna@linux.vnet.ibm.com>
+Date: Tue, 4 Nov 2014 23:02:15 +0530
+Subject: [PATCH] Test: Add a testcase for PowerPC compat mode cpu
+ specification.
+
+This introduces a testcase for PowerPC compat mode cpu specification.
+
+Signed-off-by: Prerna Saxena <prerna@linux.vnet.ibm.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 12c381114ce362e49cadb730b5faabbc150a8878)
+---
+ .../qemuxml2argv-pseries-cpu-compat.args             |  8 ++++++++
+ .../qemuxml2argv-pseries-cpu-compat.xml              | 20 ++++++++++++++++++++
+ tests/qemuxml2argvtest.c                             |  2 ++
+ 3 files changed, 30 insertions(+)
+ create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args
+ create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.xml
+
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args
+new file mode 100644
+index 0000000..64df406
+--- /dev/null
++++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args
+@@ -0,0 +1,8 @@
++LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
++QEMU_AUDIO_DRV=none /usr/bin/qemu-system-ppc64 -S -M pseries \
++-cpu host,compat=power7 \
++-m 214 -smp 4 -nographic -nodefconfig -nodefaults \
++-chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \
++-mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -usb \
++-chardev pty,id=charserial0 \
++-device spapr-vty,chardev=charserial0,reg=0x30000000
+diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.xml
+new file mode 100644
+index 0000000..e34a8ad
+--- /dev/null
++++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.xml
+@@ -0,0 +1,20 @@
++<domain type='kvm'>
++  <name>QEMUGuest1</name>
++  <memory unit='KiB'>219100</memory>
++  <currentMemory unit='KiB'>219100</currentMemory>
++  <vcpu placement='static'>4</vcpu>
++  <os>
++    <type arch='ppc64' machine='pseries'>hvm</type>
++  </os>
++  <cpu mode='host-model'>
++    <model>power7</model>
++  </cpu>
++  <clock offset='utc'/>
++  <devices>
++      <emulator>/usr/bin/qemu-system-ppc64</emulator>
++      <console type='pty'>
++        <address type="spapr-vio"/>
++      </console>
++      <memballoon model="none"/>
++  </devices>
++</domain>
+diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
+index 5539a84..e24d17f 100644
+--- a/tests/qemuxml2argvtest.c
++++ b/tests/qemuxml2argvtest.c
+@@ -1314,6 +1314,8 @@ mymain(void)
+             QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
+     DO_TEST("pseries-cpu-exact", QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE,
+             QEMU_CAPS_NODEFCONFIG);
++    DO_TEST("pseries-cpu-compat", QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST,
++            QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG);
+     DO_TEST("disk-ide-drive-split",
+             QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
+             QEMU_CAPS_IDE_CD);

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

@@ -1,105 +0,0 @@
-From: Laine Stump <laine@laine.org>
-Date: Wed, 25 Apr 2018 17:12:03 -0400
-Subject: [PATCH] nwfilter: increase pcap buffer size to be compatible with
- TPACKET_V3
-
-When an nwfilter rule sets the parameter CTRL_IP_LEARNING to "dhcp",
-this turns on the "dhcpsnoop" thread, which uses libpcap to monitor
-traffic on the domain's tap device and extract the IP address from the
-DHCP response.
-
-If libpcap on the host is built with HAVE_TPACKET3 defined (to enable
-support for TPACKET_V3), the dhcpsnoop code's initialization of the
-libpcap socket would fail with the following error:
-
-  virNWFilterSnoopDHCPOpen:1134 : internal error: pcap_setfilter: can't remove kernel filter: Bad file descriptor
-
-It turns out that this was because TPACKET_V3 requires a larger buffer
-size than libvirt was setting (we were setting it to 128k). Changing
-the buffer size to 256k eliminates the error, and the dhcpsnoop thread
-once again works properly.
-
-A fuller explanation of why TPACKET_V3 requires such a large buffer,
-for future git spelunkers:
-
-libpcap calls setsockopt(... SOL_PACKET, PACKET_RX_RING...) to setup a
-ring buffer for receiving packets; two of the attributes sent to this
-API are called tp_frame_size, and tp_frame_nr. If libpcap was built
-with HAVE_TPACKET3 defined, tp_trame_size is set to MAXIMUM_SNAPLEN
-(defined in libpcap sources as 262144) and tp_frame_nr is set to:
-
- [the buffer size we set, i.e. PCAP_BUFFERSIZE i.e. 262144] / tp_frame_size.
-
-So if PCAP_BUFFERSIZE < MAXIMUM_SNAPLEN, then tp_frame_nr (the number
-of frames in the ring buffer) is 0, which is nonsensical. This same
-value is later used as a multiplier to determine the size for a call
-to malloc() (which would also fail).
-
-(NB: if HAVE_TPACKET3 is *not* defined, then tp_frame_size is set to
-the snaplen set by the user (in our case 576) plus a small amount to
-account for ethernet headers, so 256k is far more than adequate)
-
-Since the TPACKET_V3 code in libpcap actually reads multiple packets
-into each frame, it's not a problem to have only a single frame
-(especially when we are monitoring such infrequent traffic), so it's
-okay to set this relatively small buffer size (in comparison to the
-default, which is 2MB), which is important since every guest using
-dhcp snooping in a nwfilter rule will hold 2 of these buffers for the
-entire life of the guest.
-
-Thanks to Christian Ehrhardt for discovering that buffer size was the
-problem (this was not at all obvious from the error that was logged!)
-
-Resolves: https://bugzilla.redhat.com/1547237
-Fixes: https://bugs.launchpad.net/libvirt/+bug/1758037
-
-Signed-off-by: Laine Stump <laine@laine.org>
-Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com> (V1)
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-Tested-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
----
- src/nwfilter/nwfilter_dhcpsnoop.c | 22 +++++++++++++++++++---
- 1 file changed, 19 insertions(+), 3 deletions(-)
-
-diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
-index 6069e70460..50cfb944a2 100644
---- a/src/nwfilter/nwfilter_dhcpsnoop.c
-+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
-@@ -256,10 +256,21 @@ struct _virNWFilterDHCPDecodeJob {
- # define DHCP_BURST_INTERVAL_S  10 /* sec */
- 
- /*
-- * libpcap 1.5 requires a 128kb buffer
-- * 128 kb is bigger than (DHCP_PKT_BURST * PCAP_PBUFSIZE / 2)
-+ * NB: Any libpcap built with HAVE_TPACKET3 will require
-+ * PCAP_BUFFERSIZE to be at least 262144 (although
-+ * pcap_set_buffer_size() with a lower value will succeed, and the
-+ * error will only show up later when pcap_setfilter() is called).
-+ *
-+ * It is possible that in the future libpcap could increase the
-+ * minimum size even further, but due to the fact that each guest
-+ * using dhcp snooping keeps 2 pcap sockets open (and thus 2 buffers
-+ * allocated) for the life of the guest, we want to minimize the
-+ * length of the buffer, so instead of leaving it at the default size
-+ * (2MB), we are setting it to the minimum viable size and including
-+ * this clue in the source to help quickly resolve the problem when/if
-+ * it reoccurs.
-  */
--# define PCAP_BUFFERSIZE        (128 * 1024)
-+# define PCAP_BUFFERSIZE        (256 * 1024)
- 
- # define MAX_QUEUED_JOBS        (DHCP_PKT_BURST + 2 * DHCP_PKT_RATE)
- 
-@@ -1114,6 +1125,11 @@ virNWFilterSnoopDHCPOpen(const char *ifname, virMacAddr *mac,
-         goto cleanup_nohandle;
-     }
- 
-+    /* IMPORTANT: If there is any failure of *any* pcap_* function
-+     * during setup of the socket, look to the comment where
-+     * PCAP_BUFFERSIZE is defined. It may be too small, even if the
-+     * generated error doesn't imply that.
-+     */
-     if (pcap_set_snaplen(handle, PCAP_PBUFSIZE) < 0 ||
-         pcap_set_buffer_size(handle, PCAP_BUFFERSIZE) < 0 ||
-         pcap_activate(handle) < 0) {

0006-polkit-Allow-password-less-access-for-libvirt-group.patch

@@ -0,0 +1,126 @@
+From: Cole Robinson <crobinso@redhat.com>
+Date: Tue, 28 Apr 2015 17:38:00 -0400
+Subject: [PATCH] polkit: Allow password-less access for 'libvirt' group
+
+Many users, who admin their own machines, want to be able to access
+system libvirtd via tools like virt-manager without having to enter
+a root password. Just google 'virt-manager without password' and
+you'll find many hits. I've read at least 5 blog posts over the years
+describing slightly different ways of achieving this goal.
+
+Let's finally add official support for this.
+
+Install a polkit-1 rules file granting password-less auth for any user
+in the new 'libvirt' group. Create the group on RPM install
+
+https://bugzilla.redhat.com/show_bug.cgi?id=957300
+(cherry picked from commit e94979e901517af9fdde358d7b7c92cc055dd50c)
+---
+ daemon/Makefile.am   | 13 +++++++++++++
+ daemon/libvirt.rules |  9 +++++++++
+ libvirt.spec.in      | 15 +++++++++++++--
+ 3 files changed, 35 insertions(+), 2 deletions(-)
+ create mode 100644 daemon/libvirt.rules
+
+diff --git a/daemon/Makefile.am b/daemon/Makefile.am
+index b95a79d..9c5ea37 100644
+--- a/daemon/Makefile.am
++++ b/daemon/Makefile.am
+@@ -53,6 +53,7 @@ EXTRA_DIST =						\
+ 	libvirtd.init.in				\
+ 	libvirtd.upstart				\
+ 	libvirtd.policy.in				\
++	libvirt.rules					\
+ 	libvirtd.sasl					\
+ 	libvirtd.service.in				\
+ 	libvirtd.socket.in				\
+@@ -233,6 +234,8 @@ policyauth = auth_admin_keep_session
+ else ! WITH_POLKIT0
+ policydir = $(datadir)/polkit-1/actions
+ policyauth = auth_admin_keep
++rulesdir = $(datadir)/polkit-1/rules.d
++rulesfile = libvirt.rules
+ endif ! WITH_POLKIT0
+ endif WITH_POLKIT
+ 
+@@ -263,9 +266,19 @@ if WITH_POLKIT
+ install-data-polkit::
+ 	$(MKDIR_P) $(DESTDIR)$(policydir)
+ 	$(INSTALL_DATA) libvirtd.policy $(DESTDIR)$(policydir)/org.libvirt.unix.policy
++if ! WITH_POLKIT0
++	$(MKDIR_P) $(DESTDIR)$(rulesdir)
++	$(INSTALL_DATA) $(srcdir)/$(rulesfile) $(DESTDIR)$(rulesdir)/50-libvirt.rules
++endif ! WITH_POLKIT0
++
+ uninstall-data-polkit::
+ 	rm -f $(DESTDIR)$(policydir)/org.libvirt.unix.policy
+ 	rmdir $(DESTDIR)$(policydir) || :
++if ! WITH_POLKIT0
++	rm -f $(DESTDIR)$(rulesdir)/50-libvirt.rules
++	rmdir $(DESTDIR)$(rulesdir) || :
++endif ! WITH_POLKIT0
++
+ else ! WITH_POLKIT
+ install-data-polkit::
+ uninstall-data-polkit::
+diff --git a/daemon/libvirt.rules b/daemon/libvirt.rules
+new file mode 100644
+index 0000000..01a15fa
+--- /dev/null
++++ b/daemon/libvirt.rules
+@@ -0,0 +1,9 @@
++// Allow any user in the 'libvirt' group to connect to system libvirtd
++// without entering a password.
++
++polkit.addRule(function(action, subject) {
++    if (action.id == "org.libvirt.unix.manage" &&
++        subject.isInGroup("libvirt")) {
++        return polkit.Result.YES;
++    }
++});
+diff --git a/libvirt.spec.in b/libvirt.spec.in
+index a84b19d..5de085b 100644
+--- a/libvirt.spec.in
++++ b/libvirt.spec.in
+@@ -1583,9 +1583,9 @@ then
+ fi
+ 
+ %if %{with_libvirtd}
++%pre daemon
+     %if ! %{with_driver_modules}
+         %if %{with_qemu}
+-%pre daemon
+             %if 0%{?fedora} || 0%{?rhel} >= 6
+ # We want soft static allocation of well-known ids, as disk images
+ # are commonly shared across NFS mounts by id rather than name; see
+@@ -1599,11 +1599,21 @@ if ! getent passwd qemu >/dev/null; then
+     useradd -r -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu
+   fi
+ fi
+-exit 0
+             %endif
+         %endif
+     %endif
+ 
++    %if %{with_polkit}
++        %if 0%{?fedora} || 0%{?rhel} >= 6
++# 'libvirt' group is just to allow password-less polkit access to
++# libvirtd. The uid number is irrelevant, so we use dynamic allocation
++# described at the above link.
++getent group libvirt >/dev/null || groupadd -r libvirt
++        %endif
++    %endif
++
++exit 0
++
+ %post daemon
+ 
+     %if %{with_network}
+@@ -1919,6 +1929,7 @@ exit 0
+         %if 0%{?fedora} || 0%{?rhel} >= 6
+ %{_datadir}/polkit-1/actions/org.libvirt.unix.policy
+ %{_datadir}/polkit-1/actions/org.libvirt.api.policy
++%{_datadir}/polkit-1/rules.d/50-libvirt.rules
+         %else
+ %{_datadir}/PolicyKit/policy/org.libvirt.unix.policy
+         %endif

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

@@ -1,253 +0,0 @@
-From: Vincent Bernat <vincent@bernat.im>
-Date: Tue, 10 Apr 2018 08:27:15 +0200
-Subject: [PATCH] util: don't check for parallel iteration in hash-related
- functions
-
-This is the responsability of the caller to apply the correct lock
-before using these functions. Moreover, the use of a simple boolean
-was still racy: two threads may check the boolean and "lock" it
-simultaneously.
-
-Users of functions from src/util/virhash.c have to be checked for
-correctness. Lookups and iteration should hold a RO
-lock. Modifications should hold a RW lock.
-
-Most important uses seem to be covered. Callers have now a greater
-responsability, notably the ability to execute some operations while
-iterating were reliably forbidden before are now accepted.
-
-Signed-off-by: Vincent Bernat <vincent@bernat.im>
-(cherry picked from commit 4d7384eb9ddef2008cb0cc165eb808f74bc83d6b)
----
- src/util/virhash.c  | 37 --------------------
- tests/virhashtest.c | 83 ---------------------------------------------
- 2 files changed, 120 deletions(-)
-
-diff --git a/src/util/virhash.c b/src/util/virhash.c
-index 0ffbfcce2c..475c2b0281 100644
---- a/src/util/virhash.c
-+++ b/src/util/virhash.c
-@@ -41,12 +41,6 @@ VIR_LOG_INIT("util.hash");
- 
- /* #define DEBUG_GROW */
- 
--#define virHashIterationError(ret) \
--    do { \
--        VIR_ERROR(_("Hash operation not allowed during iteration")); \
--        return ret; \
--    } while (0)
--
- /*
-  * A single entry in the hash table
-  */
-@@ -66,10 +60,6 @@ struct _virHashTable {
-     uint32_t seed;
-     size_t size;
-     size_t nbElems;
--    /* True iff we are iterating over hash entries. */
--    bool iterating;
--    /* Pointer to the current entry during iteration. */
--    virHashEntryPtr current;
-     virHashDataFree dataFree;
-     virHashKeyCode keyCode;
-     virHashKeyEqual keyEqual;
-@@ -339,9 +329,6 @@ virHashAddOrUpdateEntry(virHashTablePtr table, const void *name,
-     if ((table == NULL) || (name == NULL))
-         return -1;
- 
--    if (table->iterating)
--        virHashIterationError(-1);
--
-     key = virHashComputeKey(table, name);
- 
-     /* Check for duplicate entry */
-@@ -551,9 +538,6 @@ virHashRemoveEntry(virHashTablePtr table, const void *name)
-     nextptr = table->table + virHashComputeKey(table, name);
-     for (entry = *nextptr; entry; entry = entry->next) {
-         if (table->keyEqual(entry->name, name)) {
--            if (table->iterating && table->current != entry)
--                virHashIterationError(-1);
--
-             if (table->dataFree)
-                 table->dataFree(entry->payload, entry->name);
-             if (table->keyFree)
-@@ -593,18 +577,11 @@ virHashForEach(virHashTablePtr table, virHashIterator iter, void *data)
-     if (table == NULL || iter == NULL)
-         return -1;
- 
--    if (table->iterating)
--        virHashIterationError(-1);
--
--    table->iterating = true;
--    table->current = NULL;
-     for (i = 0; i < table->size; i++) {
-         virHashEntryPtr entry = table->table[i];
-         while (entry) {
-             virHashEntryPtr next = entry->next;
--            table->current = entry;
-             ret = iter(entry->payload, entry->name, data);
--            table->current = NULL;
- 
-             if (ret < 0)
-                 goto cleanup;
-@@ -615,7 +592,6 @@ virHashForEach(virHashTablePtr table, virHashIterator iter, void *data)
- 
-     ret = 0;
-  cleanup:
--    table->iterating = false;
-     return ret;
- }
- 
-@@ -643,11 +619,6 @@ virHashRemoveSet(virHashTablePtr table,
-     if (table == NULL || iter == NULL)
-         return -1;
- 
--    if (table->iterating)
--        virHashIterationError(-1);
--
--    table->iterating = true;
--    table->current = NULL;
-     for (i = 0; i < table->size; i++) {
-         virHashEntryPtr *nextptr = table->table + i;
- 
-@@ -667,7 +638,6 @@ virHashRemoveSet(virHashTablePtr table,
-             }
-         }
-     }
--    table->iterating = false;
- 
-     return count;
- }
-@@ -723,23 +693,16 @@ void *virHashSearch(const virHashTable *ctable,
-     if (table == NULL || iter == NULL)
-         return NULL;
- 
--    if (table->iterating)
--        virHashIterationError(NULL);
--
--    table->iterating = true;
--    table->current = NULL;
-     for (i = 0; i < table->size; i++) {
-         virHashEntryPtr entry;
-         for (entry = table->table[i]; entry; entry = entry->next) {
-             if (iter(entry->payload, entry->name, data)) {
--                table->iterating = false;
-                 if (name)
-                     *name = table->keyCopy(entry->name);
-                 return entry->payload;
-             }
-         }
-     }
--    table->iterating = false;
- 
-     return NULL;
- }
-diff --git a/tests/virhashtest.c b/tests/virhashtest.c
-index 3b85b62c30..e9c03c1afb 100644
---- a/tests/virhashtest.c
-+++ b/tests/virhashtest.c
-@@ -221,32 +221,6 @@ testHashRemoveForEachAll(void *payload ATTRIBUTE_UNUSED,
- }
- 
- 
--const int testHashCountRemoveForEachForbidden = ARRAY_CARDINALITY(uuids);
--
--static int
--testHashRemoveForEachForbidden(void *payload ATTRIBUTE_UNUSED,
--                               const void *name,
--                               void *data)
--{
--    virHashTablePtr hash = data;
--    size_t i;
--
--    for (i = 0; i < ARRAY_CARDINALITY(uuids_subset); i++) {
--        if (STREQ(uuids_subset[i], name)) {
--            int next = (i + 1) % ARRAY_CARDINALITY(uuids_subset);
--
--            if (virHashRemoveEntry(hash, uuids_subset[next]) == 0) {
--                VIR_TEST_VERBOSE(
--                        "\nentry \"%s\" should not be allowed to be removed",
--                        uuids_subset[next]);
--            }
--            break;
--        }
--    }
--    return 0;
--}
--
--
- static int
- testHashRemoveForEach(const void *data)
- {
-@@ -303,61 +277,6 @@ testHashSteal(const void *data ATTRIBUTE_UNUSED)
- }
- 
- 
--static int
--testHashIter(void *payload ATTRIBUTE_UNUSED,
--             const void *name ATTRIBUTE_UNUSED,
--             void *data ATTRIBUTE_UNUSED)
--{
--    return 0;
--}
--
--static int
--testHashForEachIter(void *payload ATTRIBUTE_UNUSED,
--                    const void *name ATTRIBUTE_UNUSED,
--                    void *data)
--{
--    virHashTablePtr hash = data;
--
--    if (virHashAddEntry(hash, uuids_new[0], NULL) == 0)
--        VIR_TEST_VERBOSE("\nadding entries in ForEach should be forbidden");
--
--    if (virHashUpdateEntry(hash, uuids_new[0], NULL) == 0)
--        VIR_TEST_VERBOSE("\nupdating entries in ForEach should be forbidden");
--
--    if (virHashSteal(hash, uuids_new[0]) != NULL)
--        VIR_TEST_VERBOSE("\nstealing entries in ForEach should be forbidden");
--
--    if (virHashSteal(hash, uuids_new[0]) != NULL)
--        VIR_TEST_VERBOSE("\nstealing entries in ForEach should be forbidden");
--
--    if (virHashForEach(hash, testHashIter, NULL) >= 0)
--        VIR_TEST_VERBOSE("\niterating through hash in ForEach"
--                " should be forbidden");
--    return 0;
--}
--
--static int
--testHashForEach(const void *data ATTRIBUTE_UNUSED)
--{
--    virHashTablePtr hash;
--    int ret = -1;
--
--    if (!(hash = testHashInit(0)))
--        return -1;
--
--    if (virHashForEach(hash, testHashForEachIter, hash)) {
--        VIR_TEST_VERBOSE("\nvirHashForEach didn't go through all entries");
--        goto cleanup;
--    }
--
--    ret = 0;
--
-- cleanup:
--    virHashFree(hash);
--    return ret;
--}
--
--
- static int
- testHashRemoveSetIter(const void *payload ATTRIBUTE_UNUSED,
-                       const void *name,
-@@ -628,9 +547,7 @@ mymain(void)
-     DO_TEST("Remove", Remove);
-     DO_TEST_DATA("Remove in ForEach", RemoveForEach, Some);
-     DO_TEST_DATA("Remove in ForEach", RemoveForEach, All);
--    DO_TEST_DATA("Remove in ForEach", RemoveForEach, Forbidden);
-     DO_TEST("Steal", Steal);
--    DO_TEST("Forbidden ops in ForEach", ForEach);
-     DO_TEST("RemoveSet", RemoveSet);
-     DO_TEST("Search", Search);
-     DO_TEST("GetItems", GetItems);

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

@@ -1,64 +0,0 @@
-From: Matthias Bolte <matthias.bolte@googlemail.com>
-Date: Thu, 2 Aug 2018 17:33:37 +0200
-Subject: [PATCH] esx: Fix double-free and freeing static strings in
- esxDomainSetAutostart
-
-Since commit ae83e02f3dd7fe99fed5d8159a35b666fafeafd5#l3393 the
-newPowerInfo pointer itself is used to track the ownership of the
-AutoStartPowerInfo object to make Coverity understand the code better.
-This broke the code that unset some members of the AutoStartPowerInfo
-object that should not be freed the normal way.
-
-Instead, transfer ownership of the AutoStartPowerInfo object to the
-HostAutoStartManagerConfig object before filling in the values that
-need special handling. This allows to free the AutoStartPowerInfo
-directly without having to deal with the special values, or to let
-the old (now restored) logic handle the special values again.
-
-Signed-off-by: Matthias Bolte <matthias.bolte@googlemail.com>
-Tested-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
-Reviewed-by: John Ferlan <jferlan@redhat.com>
-(cherry picked from commit 3ad77f853230f870efa396636e008292c7f2b1c0)
----
- src/esx/esx_driver.c | 14 ++++----------
- 1 file changed, 4 insertions(+), 10 deletions(-)
-
-diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
-index b065cdc513..9a7006c6e5 100644
---- a/src/esx/esx_driver.c
-+++ b/src/esx/esx_driver.c
-@@ -3422,7 +3422,10 @@ esxDomainSetAutostart(virDomainPtr domain, int autostart)
-     if (esxVI_AutoStartPowerInfo_Alloc(&newPowerInfo) < 0 ||
-         esxVI_Int_Alloc(&newPowerInfo->startOrder) < 0 ||
-         esxVI_Int_Alloc(&newPowerInfo->startDelay) < 0 ||
--        esxVI_Int_Alloc(&newPowerInfo->stopDelay) < 0) {
-+        esxVI_Int_Alloc(&newPowerInfo->stopDelay) < 0 ||
-+        esxVI_AutoStartPowerInfo_AppendToList(&spec->powerInfo,
-+                                              newPowerInfo) < 0) {
-+        esxVI_AutoStartPowerInfo_Free(&newPowerInfo);
-         goto cleanup;
-     }
- 
-@@ -3434,13 +3437,6 @@ esxDomainSetAutostart(virDomainPtr domain, int autostart)
-     newPowerInfo->stopDelay->value = -1; /* use system default */
-     newPowerInfo->stopAction = (char *)"none";
- 
--    if (esxVI_AutoStartPowerInfo_AppendToList(&spec->powerInfo,
--                                              newPowerInfo) < 0) {
--        goto cleanup;
--    }
--
--    newPowerInfo = NULL;
--
-     if (esxVI_ReconfigureAutostart
-           (priv->primary,
-            priv->primary->hostSystem->configManager->autoStartManager,
-@@ -3462,8 +3458,6 @@ esxDomainSetAutostart(virDomainPtr domain, int autostart)
-     esxVI_AutoStartDefaults_Free(&defaults);
-     esxVI_AutoStartPowerInfo_Free(&powerInfoList);
- 
--    esxVI_AutoStartPowerInfo_Free(&newPowerInfo);
--
-     return result;
- }
- 

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

@@ -1,55 +0,0 @@
-From 8d6ab7976fa691763fc05a154f2bab865d435b00 Mon Sep 17 00:00:00 2001
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 5 Apr 2019 11:33:32 +0200
-Subject: [PATCH 1/4] cpu_x86: Do not cache microcode version
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The microcode version checks are used to invalidate cached CPU data we
-get from QEMU. To minimize /proc/cpuinfo parsing the microcode version
-was only read when libvirtd started and cached for the daemon's
-lifetime. However, the CPU microcode can change anytime (updating the
-microcode package can automatically upload it to the CPU) and we need to
-stop caching it to avoid using stale CPU model data.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit be46f613261d3b655a1f15afd635087e68a9c39b)
----
- src/cpu/cpu_x86.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
-index b2398c5ad2..38cab15c59 100644
---- a/src/cpu/cpu_x86.c
-+++ b/src/cpu/cpu_x86.c
-@@ -154,7 +154,6 @@ struct _virCPUx86Map {
- };
- 
- static virCPUx86MapPtr cpuMap;
--static unsigned int microcodeVersion;
- 
- int virCPUx86DriverOnceInit(void);
- VIR_ONCE_GLOBAL_INIT(virCPUx86Driver);
-@@ -1413,8 +1412,6 @@ virCPUx86DriverOnceInit(void)
-     if (!(cpuMap = virCPUx86LoadMap()))
-         return -1;
- 
--    microcodeVersion = virHostCPUGetMicrocodeVersion();
--
-     return 0;
- }
- 
-@@ -2454,7 +2451,7 @@ virCPUx86GetHost(virCPUDefPtr cpu,
-         goto cleanup;
- 
-     ret = x86DecodeCPUData(cpu, cpuData, models);
--    cpu->microcodeVersion = microcodeVersion;
-+    cpu->microcodeVersion = virHostCPUGetMicrocodeVersion();
- 
-  cleanup:
-     virCPUx86DataFree(cpuData);
--- 
-2.21.0
-

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

@@ -1,155 +0,0 @@
-From cb6bcb0312a33a0b6a48d0ee1f368c9080e4a13d Mon Sep 17 00:00:00 2001
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 12 Apr 2019 21:21:05 +0200
-Subject: [PATCH 2/4] qemu: Don't cache microcode version
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-My earlier commit be46f61326 was incomplete. It removed caching of
-microcode version in the CPU driver, which means the capabilities XML
-will see the correct microcode version. But it is also cached in the
-QEMU capabilities cache where it is used to detect whether we need to
-reprobe QEMU. By missing the second place, the original commit
-be46f61326 made the situation even worse since libvirt would report
-correct microcode version while still using the old host CPU model
-(visible in domain capabilities XML).
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 673c62a3b7855a0685d8f116e227c402720b9ee9)
-
-CVE-2018-12126, CVE-2018-12127, CVE-2018-12130
-
-Conflicts:
-	src/qemu/qemu_capabilities.c
-            - virQEMUCapsCacheLookupByArch refactoring (commits
-              7948ad4129a and 1a3de67001c) are missing
-            - commit a7424faff0f "Force QMP capability probing" is
-              missing downstream
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
----
- src/qemu/qemu_capabilities.c | 12 ++++++++----
- src/qemu/qemu_capabilities.h |  3 +--
- src/qemu/qemu_driver.c       |  9 +--------
- tests/testutilsqemu.c        |  2 +-
- 4 files changed, 11 insertions(+), 15 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index b5eb8cf46a..17eb6579bf 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -5343,7 +5343,7 @@ virQEMUCapsNewData(const char *binary,
-                                            priv->libDir,
-                                            priv->runUid,
-                                            priv->runGid,
--                                           priv->microcodeVersion,
-+                                           virHostCPUGetMicrocodeVersion(),
-                                            priv->kernelVersion,
-                                            false);
- }
-@@ -5427,8 +5427,7 @@ virFileCachePtr
- virQEMUCapsCacheNew(const char *libDir,
-                     const char *cacheDir,
-                     uid_t runUid,
--                    gid_t runGid,
--                    unsigned int microcodeVersion)
-+                    gid_t runGid)
- {
-     char *capsCacheDir = NULL;
-     virFileCachePtr cache = NULL;
-@@ -5452,7 +5451,6 @@ virQEMUCapsCacheNew(const char *libDir,
- 
-     priv->runUid = runUid;
-     priv->runGid = runGid;
--    priv->microcodeVersion = microcodeVersion;
- 
-     if (uname(&uts) == 0 &&
-         virAsprintf(&priv->kernelVersion, "%s %s", uts.release, uts.version) < 0)
-@@ -5473,8 +5471,11 @@ virQEMUCapsPtr
- virQEMUCapsCacheLookup(virFileCachePtr cache,
-                        const char *binary)
- {
-+    virQEMUCapsCachePrivPtr priv = virFileCacheGetPriv(cache);
-     virQEMUCapsPtr ret = NULL;
- 
-+    priv->microcodeVersion = virHostCPUGetMicrocodeVersion();
-+
-     ret = virFileCacheLookup(cache, binary);
- 
-     VIR_DEBUG("Returning caps %p for %s", ret, binary);
-@@ -5520,10 +5521,13 @@ virQEMUCapsPtr
- virQEMUCapsCacheLookupByArch(virFileCachePtr cache,
-                              virArch arch)
- {
-+    virQEMUCapsCachePrivPtr priv = virFileCacheGetPriv(cache);
-     virQEMUCapsPtr ret = NULL;
-     virArch target;
-     struct virQEMUCapsSearchData data = { .arch = arch };
- 
-+    priv->microcodeVersion = virHostCPUGetMicrocodeVersion();
-+
-     ret = virFileCacheLookupByFunc(cache, virQEMUCapsCompareArch, &data);
-     if (!ret) {
-         /* If the first attempt at finding capabilities has failed, try
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index c2ec2be193..7fd51f5fa0 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -524,8 +524,7 @@ void virQEMUCapsFilterByMachineType(virQEMUCapsPtr qemuCaps,
- virFileCachePtr virQEMUCapsCacheNew(const char *libDir,
-                                     const char *cacheDir,
-                                     uid_t uid,
--                                    gid_t gid,
--                                    unsigned int microcodeVersion);
-+                                    gid_t gid);
- virQEMUCapsPtr virQEMUCapsCacheLookup(virFileCachePtr cache,
-                                       const char *binary);
- virQEMUCapsPtr virQEMUCapsCacheLookupCopy(virFileCachePtr cache,
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 96454c17c0..bb38904090 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -610,8 +610,6 @@ qemuStateInitialize(bool privileged,
-     char *hugepagePath = NULL;
-     char *memoryBackingPath = NULL;
-     size_t i;
--    virCPUDefPtr hostCPU = NULL;
--    unsigned int microcodeVersion = 0;
- 
-     if (VIR_ALLOC(qemu_driver) < 0)
-         return -1;
-@@ -831,15 +829,10 @@ qemuStateInitialize(bool privileged,
-         run_gid = cfg->group;
-     }
- 
--    if ((hostCPU = virCPUProbeHost(virArchFromHost())))
--        microcodeVersion = hostCPU->microcodeVersion;
--    virCPUDefFree(hostCPU);
--
-     qemu_driver->qemuCapsCache = virQEMUCapsCacheNew(cfg->libDir,
-                                                      cfg->cacheDir,
-                                                      run_uid,
--                                                     run_gid,
--                                                     microcodeVersion);
-+                                                     run_gid);
-     if (!qemu_driver->qemuCapsCache)
-         goto error;
- 
-diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
-index f8182033fc..2c7124bf26 100644
---- a/tests/testutilsqemu.c
-+++ b/tests/testutilsqemu.c
-@@ -603,7 +603,7 @@ int qemuTestDriverInit(virQEMUDriver *driver)
- 
-     /* Using /dev/null for libDir and cacheDir automatically produces errors
-      * upon attempt to use any of them */
--    driver->qemuCapsCache = virQEMUCapsCacheNew("/dev/null", "/dev/null", 0, 0, 0);
-+    driver->qemuCapsCache = virQEMUCapsCacheNew("/dev/null", "/dev/null", 0, 0);
-     if (!driver->qemuCapsCache)
-         goto error;
- 
--- 
-2.21.0
-

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

@@ -1,886 +0,0 @@
-From 36151b10d3e1f8f92f4ad6b8200ce5355b7f96f0 Mon Sep 17 00:00:00 2001
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 5 Apr 2019 11:19:30 +0200
-Subject: [PATCH 3/4] cputest: Add data for Intel(R) Xeon(R) CPU E3-1225 v5
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 5cd9db3ac11e88846cbcf95fad9f6fae9d880dee)
-
-CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091
-
-Conflicts:
-	tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-	tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-            - intel-pt feature is missing
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
----
- tests/cputest.c                               |   1 +
- .../x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml |   7 +
- .../x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml  |   8 +
- .../x86_64-cpuid-Xeon-E3-1225-v5-guest.xml    |  27 +
- .../x86_64-cpuid-Xeon-E3-1225-v5-host.xml     |  28 +
- .../x86_64-cpuid-Xeon-E3-1225-v5-json.xml     |  11 +
- .../x86_64-cpuid-Xeon-E3-1225-v5.json         | 652 ++++++++++++++++++
- .../x86_64-cpuid-Xeon-E3-1225-v5.sig          |   4 +
- .../x86_64-cpuid-Xeon-E3-1225-v5.xml          |  47 ++
- 9 files changed, 785 insertions(+)
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.json
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.sig
- create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.xml
-
-diff --git a/tests/cputest.c b/tests/cputest.c
-index 1e79edbef7..2df1d28e39 100644
---- a/tests/cputest.c
-+++ b/tests/cputest.c
-@@ -1189,6 +1189,7 @@ mymain(void)
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Phenom-B95", JSON_HOST);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Ryzen-7-1800X-Eight-Core", JSON_HOST);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-5110", JSON_NONE);
-+    DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E3-1225-v5", JSON_MODELS);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E3-1245-v5", JSON_MODELS);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2609-v3", JSON_MODELS);
-     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2623-v4", JSON_MODELS);
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml
-new file mode 100644
-index 0000000000..ce51903e53
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml
-@@ -0,0 +1,7 @@
-+<!-- Features disabled by QEMU -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0800c1fc' edx='0xb0600000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-+</cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
-new file mode 100644
-index 0000000000..0deca9fba6
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
-@@ -0,0 +1,8 @@
-+<!-- Features enabled by QEMU -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3203' edx='0x0f8bfbff'/>
-+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c4fbb' ecx='0x00000000' edx='0x8c000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000007' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
-+</cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-new file mode 100644
-index 0000000000..141c01c841
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-@@ -0,0 +1,27 @@
-+<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>Skylake-Client-IBRS</model>
-+  <vendor>Intel</vendor>
-+  <feature policy='require' name='ds'/>
-+  <feature policy='require' name='acpi'/>
-+  <feature policy='require' name='ss'/>
-+  <feature policy='require' name='ht'/>
-+  <feature policy='require' name='tm'/>
-+  <feature policy='require' name='pbe'/>
-+  <feature policy='require' name='dtes64'/>
-+  <feature policy='require' name='monitor'/>
-+  <feature policy='require' name='ds_cpl'/>
-+  <feature policy='require' name='vmx'/>
-+  <feature policy='require' name='smx'/>
-+  <feature policy='require' name='est'/>
-+  <feature policy='require' name='tm2'/>
-+  <feature policy='require' name='xtpr'/>
-+  <feature policy='require' name='pdcm'/>
-+  <feature policy='require' name='osxsave'/>
-+  <feature policy='require' name='tsc_adjust'/>
-+  <feature policy='require' name='clflushopt'/>
-+  <feature policy='require' name='stibp'/>
-+  <feature policy='require' name='ssbd'/>
-+  <feature policy='require' name='xsaves'/>
-+  <feature policy='require' name='pdpe1gb'/>
-+  <feature policy='require' name='invtsc'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-new file mode 100644
-index 0000000000..53bfc9728d
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-@@ -0,0 +1,28 @@
-+<cpu>
-+  <arch>x86_64</arch>
-+  <model>Skylake-Client-IBRS</model>
-+  <vendor>Intel</vendor>
-+  <feature name='ds'/>
-+  <feature name='acpi'/>
-+  <feature name='ss'/>
-+  <feature name='ht'/>
-+  <feature name='tm'/>
-+  <feature name='pbe'/>
-+  <feature name='dtes64'/>
-+  <feature name='monitor'/>
-+  <feature name='ds_cpl'/>
-+  <feature name='vmx'/>
-+  <feature name='smx'/>
-+  <feature name='est'/>
-+  <feature name='tm2'/>
-+  <feature name='xtpr'/>
-+  <feature name='pdcm'/>
-+  <feature name='osxsave'/>
-+  <feature name='tsc_adjust'/>
-+  <feature name='clflushopt'/>
-+  <feature name='stibp'/>
-+  <feature name='ssbd'/>
-+  <feature name='xsaves'/>
-+  <feature name='pdpe1gb'/>
-+  <feature name='invtsc'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
-new file mode 100644
-index 0000000000..1f321db273
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
-@@ -0,0 +1,11 @@
-+<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>Skylake-Client-IBRS</model>
-+  <vendor>Intel</vendor>
-+  <feature policy='require' name='ss'/>
-+  <feature policy='require' name='hypervisor'/>
-+  <feature policy='require' name='tsc_adjust'/>
-+  <feature policy='require' name='clflushopt'/>
-+  <feature policy='require' name='stibp'/>
-+  <feature policy='require' name='ssbd'/>
-+  <feature policy='require' name='pdpe1gb'/>
-+</cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.json b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.json
-new file mode 100644
-index 0000000000..084747556b
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.json
-@@ -0,0 +1,652 @@
-+{
-+  "return": {
-+    "model": {
-+      "name": "base",
-+      "props": {
-+        "phys-bits": 0,
-+        "core-id": -1,
-+        "xlevel": 2147483656,
-+        "cmov": true,
-+        "ia64": false,
-+        "aes": true,
-+        "mmx": true,
-+        "rdpid": false,
-+        "arat": true,
-+        "gfni": false,
-+        "pause-filter": false,
-+        "xsavec": true,
-+        "intel-pt": false,
-+        "osxsave": false,
-+        "hv-frequencies": false,
-+        "tsc-frequency": 0,
-+        "xd": true,
-+        "hv-vendor-id": "",
-+        "kvm-asyncpf": true,
-+        "kvm_asyncpf": true,
-+        "perfctr_core": false,
-+        "perfctr-core": false,
-+        "mpx": true,
-+        "pbe": false,
-+        "decodeassists": false,
-+        "avx512cd": false,
-+        "sse4_1": true,
-+        "sse4.1": true,
-+        "sse4-1": true,
-+        "family": 6,
-+        "legacy-cache": true,
-+        "vmware-cpuid-freq": true,
-+        "avx512f": false,
-+        "msr": true,
-+        "mce": true,
-+        "mca": true,
-+        "hv-runtime": false,
-+        "xcrypt": false,
-+        "thread-id": -1,
-+        "min-level": 13,
-+        "xgetbv1": true,
-+        "cid": false,
-+        "hv-relaxed": false,
-+        "hv-crash": false,
-+        "ds": false,
-+        "fxsr": true,
-+        "xsaveopt": true,
-+        "xtpr": false,
-+        "avx512vl": false,
-+        "avx512-vpopcntdq": false,
-+        "phe": false,
-+        "extapic": false,
-+        "3dnowprefetch": true,
-+        "avx512vbmi2": false,
-+        "cr8legacy": false,
-+        "stibp": true,
-+        "cpuid-0xb": true,
-+        "xcrypt-en": false,
-+        "kvm_pv_eoi": true,
-+        "apic-id": 4294967295,
-+        "pn": false,
-+        "dca": false,
-+        "vendor": "GenuineIntel",
-+        "pku": false,
-+        "smx": false,
-+        "cmp_legacy": false,
-+        "cmp-legacy": false,
-+        "node-id": -1,
-+        "avx512-4fmaps": false,
-+        "vmcb_clean": false,
-+        "vmcb-clean": false,
-+        "3dnowext": false,
-+        "hle": true,
-+        "npt": false,
-+        "memory": "/machine/unattached/system[0]",
-+        "clwb": false,
-+        "lbrv": false,
-+        "adx": true,
-+        "ss": true,
-+        "pni": true,
-+        "svm_lock": false,
-+        "svm-lock": false,
-+        "pfthreshold": false,
-+        "smep": true,
-+        "smap": true,
-+        "x2apic": true,
-+        "avx512vbmi": false,
-+        "avx512vnni": false,
-+        "hv-stimer": false,
-+        "i64": true,
-+        "flushbyasid": false,
-+        "f16c": true,
-+        "ace2-en": false,
-+        "pat": true,
-+        "pae": true,
-+        "sse": true,
-+        "phe-en": false,
-+        "kvm_nopiodelay": true,
-+        "kvm-nopiodelay": true,
-+        "tm": false,
-+        "kvmclock-stable-bit": true,
-+        "hypervisor": true,
-+        "socket-id": -1,
-+        "pcommit": false,
-+        "syscall": true,
-+        "level": 13,
-+        "avx512dq": false,
-+        "svm": false,
-+        "full-cpuid-auto-level": true,
-+        "hv-reset": false,
-+        "invtsc": false,
-+        "sse3": true,
-+        "sse2": true,
-+        "ssbd": true,
-+        "est": false,
-+        "avx512ifma": false,
-+        "tm2": false,
-+        "kvm-pv-eoi": true,
-+        "cx8": true,
-+        "kvm_mmu": false,
-+        "kvm-mmu": false,
-+        "sse4_2": true,
-+        "sse4.2": true,
-+        "sse4-2": true,
-+        "pge": true,
-+        "fill-mtrr-mask": true,
-+        "avx512bitalg": false,
-+        "nodeid_msr": false,
-+        "pdcm": false,
-+        "movbe": true,
-+        "model": 94,
-+        "nrip_save": false,
-+        "nrip-save": false,
-+        "kvm_pv_unhalt": true,
-+        "ssse3": true,
-+        "sse4a": false,
-+        "invpcid": true,
-+        "pdpe1gb": true,
-+        "tsc-deadline": true,
-+        "fma": true,
-+        "cx16": true,
-+        "de": true,
-+        "enforce": false,
-+        "stepping": 3,
-+        "xsave": true,
-+        "clflush": true,
-+        "skinit": false,
-+        "tsc": true,
-+        "tce": false,
-+        "fpu": true,
-+        "ibs": false,
-+        "ds_cpl": false,
-+        "ds-cpl": false,
-+        "host-phys-bits": true,
-+        "fma4": false,
-+        "la57": false,
-+        "osvw": false,
-+        "check": true,
-+        "hv-spinlocks": -1,
-+        "pmu": false,
-+        "pmm": false,
-+        "apic": true,
-+        "spec-ctrl": true,
-+        "min-xlevel2": 0,
-+        "tsc-adjust": true,
-+        "tsc_adjust": true,
-+        "kvm-steal-time": true,
-+        "kvm_steal_time": true,
-+        "kvmclock": true,
-+        "l3-cache": true,
-+        "lwp": false,
-+        "ibpb": false,
-+        "xop": false,
-+        "avx": true,
-+        "ospke": false,
-+        "ace2": false,
-+        "avx512bw": false,
-+        "acpi": false,
-+        "hv-vapic": false,
-+        "fsgsbase": true,
-+        "ht": false,
-+        "nx": true,
-+        "pclmulqdq": true,
-+        "mmxext": false,
-+        "vaes": false,
-+        "popcnt": true,
-+        "xsaves": false,
-+        "tcg-cpuid": true,
-+        "lm": true,
-+        "umip": false,
-+        "pse": true,
-+        "avx2": true,
-+        "sep": true,
-+        "pclmuldq": true,
-+        "virt-ssbd": false,
-+        "x-hv-max-vps": -1,
-+        "nodeid-msr": false,
-+        "md-clear": true,
-+        "kvm": true,
-+        "misalignsse": false,
-+        "min-xlevel": 2147483656,
-+        "kvm-pv-unhalt": true,
-+        "bmi2": true,
-+        "bmi1": true,
-+        "realized": false,
-+        "tsc_scale": false,
-+        "tsc-scale": false,
-+        "topoext": false,
-+        "hv-vpindex": false,
-+        "xlevel2": 0,
-+        "clflushopt": true,
-+        "kvm-no-smi-migration": false,
-+        "monitor": false,
-+        "avx512er": false,
-+        "pmm-en": false,
-+        "pcid": true,
-+        "3dnow": false,
-+        "erms": true,
-+        "lahf-lm": true,
-+        "lahf_lm": true,
-+        "vpclmulqdq": false,
-+        "fxsr-opt": false,
-+        "hv-synic": false,
-+        "xstore": false,
-+        "fxsr_opt": false,
-+        "kvm-hint-dedicated": false,
-+        "rtm": true,
-+        "lmce": true,
-+        "hv-time": false,
-+        "perfctr-nb": false,
-+        "perfctr_nb": false,
-+        "ffxsr": false,
-+        "rdrand": true,
-+        "rdseed": true,
-+        "avx512-4vnniw": false,
-+        "vmx": false,
-+        "vme": true,
-+        "dtes64": false,
-+        "mtrr": true,
-+        "rdtscp": true,
-+        "pse36": true,
-+        "kvm-pv-tlb-flush": false,
-+        "tbm": false,
-+        "wdt": false,
-+        "pause_filter": false,
-+        "sha-ni": false,
-+        "model-id": "Intel(R) Xeon(R) CPU E3-1225 v5 @ 3.30GHz",
-+        "abm": true,
-+        "avx512pf": false,
-+        "xstore-en": false
-+      }
-+    }
-+  },
-+  "id": "model-expansion"
-+}
-+
-+{
-+  "return": [
-+    {
-+      "name": "max",
-+      "typename": "max-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": false
-+    },
-+    {
-+      "name": "host",
-+      "typename": "host-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": false
-+    },
-+    {
-+      "name": "base",
-+      "typename": "base-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": true,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu64",
-+      "typename": "qemu64-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "qemu32",
-+      "typename": "qemu32-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "phenom",
-+      "typename": "phenom-x86_64-cpu",
-+      "unavailable-features": [
-+        "mmxext",
-+        "fxsr-opt",
-+        "3dnowext",
-+        "3dnow",
-+        "sse4a",
-+        "npt"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium3",
-+      "typename": "pentium3-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium2",
-+      "typename": "pentium2-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "pentium",
-+      "typename": "pentium-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "n270",
-+      "typename": "n270-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm64",
-+      "typename": "kvm64-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "kvm32",
-+      "typename": "kvm32-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "cpu64-rhel6",
-+      "typename": "cpu64-rhel6-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "coreduo",
-+      "typename": "coreduo-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "core2duo",
-+      "typename": "core2duo-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "athlon",
-+      "typename": "athlon-x86_64-cpu",
-+      "unavailable-features": [
-+        "mmxext",
-+        "3dnowext",
-+        "3dnow"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Westmere",
-+      "typename": "Westmere-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Westmere-IBRS",
-+      "typename": "Westmere-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Server",
-+      "typename": "Skylake-Server-x86_64-cpu",
-+      "unavailable-features": [
-+        "avx512f",
-+        "avx512dq",
-+        "clwb",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512f",
-+        "avx512f",
-+        "avx512f"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Server-IBRS",
-+      "typename": "Skylake-Server-IBRS-x86_64-cpu",
-+      "unavailable-features": [
-+        "avx512f",
-+        "avx512dq",
-+        "clwb",
-+        "avx512cd",
-+        "avx512bw",
-+        "avx512vl",
-+        "avx512f",
-+        "avx512f",
-+        "avx512f"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Client",
-+      "typename": "Skylake-Client-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Skylake-Client-IBRS",
-+      "typename": "Skylake-Client-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "SandyBridge",
-+      "typename": "SandyBridge-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "SandyBridge-IBRS",
-+      "typename": "SandyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Penryn",
-+      "typename": "Penryn-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G5",
-+      "typename": "Opteron_G5-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse",
-+        "xop",
-+        "fma4",
-+        "tbm"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G4",
-+      "typename": "Opteron_G4-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse",
-+        "xop",
-+        "fma4"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G3",
-+      "typename": "Opteron_G3-x86_64-cpu",
-+      "unavailable-features": [
-+        "sse4a",
-+        "misalignsse"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G2",
-+      "typename": "Opteron_G2-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Opteron_G1",
-+      "typename": "Opteron_G1-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Nehalem",
-+      "typename": "Nehalem-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Nehalem-IBRS",
-+      "typename": "Nehalem-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "IvyBridge",
-+      "typename": "IvyBridge-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "IvyBridge-IBRS",
-+      "typename": "IvyBridge-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell",
-+      "typename": "Haswell-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-noTSX",
-+      "typename": "Haswell-noTSX-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-noTSX-IBRS",
-+      "typename": "Haswell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Haswell-IBRS",
-+      "typename": "Haswell-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "EPYC",
-+      "typename": "EPYC-x86_64-cpu",
-+      "unavailable-features": [
-+        "sha-ni",
-+        "mmxext",
-+        "fxsr-opt",
-+        "cr8legacy",
-+        "sse4a",
-+        "misalignsse",
-+        "osvw"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "EPYC-IBPB",
-+      "typename": "EPYC-IBPB-x86_64-cpu",
-+      "unavailable-features": [
-+        "sha-ni",
-+        "mmxext",
-+        "fxsr-opt",
-+        "cr8legacy",
-+        "sse4a",
-+        "misalignsse",
-+        "osvw",
-+        "ibpb"
-+      ],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Conroe",
-+      "typename": "Conroe-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell",
-+      "typename": "Broadwell-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-noTSX",
-+      "typename": "Broadwell-noTSX-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-noTSX-IBRS",
-+      "typename": "Broadwell-noTSX-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "Broadwell-IBRS",
-+      "typename": "Broadwell-IBRS-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    },
-+    {
-+      "name": "486",
-+      "typename": "486-x86_64-cpu",
-+      "unavailable-features": [],
-+      "static": false,
-+      "migration-safe": true
-+    }
-+  ],
-+  "id": "definitions"
-+}
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.sig b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.sig
-new file mode 100644
-index 0000000000..7e57c2ded6
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.sig
-@@ -0,0 +1,4 @@
-+0506e3
-+family:     6 (0x06)
-+model:     94 (0x5e)
-+stepping:   3 (0x03)
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.xml
-new file mode 100644
-index 0000000000..437429d61d
---- /dev/null
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5.xml
-@@ -0,0 +1,47 @@
-+<!-- Intel(R) Xeon(R) CPU E3-1225 v5 @ 3.30GHz -->
-+<cpudata arch='x86'>
-+  <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x00000016' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/>
-+  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000506e3' ebx='0x06100800' ecx='0x7ffafbff' edx='0xbfebfbff'/>
-+  <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b6ff' ecx='0x00000000' edx='0x00c30000'/>
-+  <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x00c0003f' ecx='0x000003ff' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f' ecx='0x00001fff' edx='0x00000006'/>
-+  <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00142120'/>
-+  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x000027f7' ebx='0x00000002' ecx='0x00000009' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x029c6fbf' ecx='0x00000000' edx='0x9c002400'/>
-+  <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300804' ebx='0x00000000' ecx='0x00000000' edx='0x00000603'/>
-+  <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000001' ecx='0x00000100' edx='0x00000006'/>
-+  <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000004' ecx='0x00000201' edx='0x00000006'/>
-+  <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x0000001f' ebx='0x00000440' ecx='0x00000440' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x000003c0' ecx='0x00000100' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x03' eax='0x00000040' ebx='0x000003c0' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x04' eax='0x00000040' ebx='0x00000400' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000d' ecx_in='0x08' eax='0x00000080' ebx='0x00000000' ecx='0x00000001' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000e' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x0000000f' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000010' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000011' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000012' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000013' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000014' ecx_in='0x00' eax='0x00000001' ebx='0x0000000f' ecx='0x00000007' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000014' ecx_in='0x01' eax='0x02490002' ebx='0x003f3fff' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000015' ecx_in='0x00' eax='0x00000002' ebx='0x00000114' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x00000016' ecx_in='0x00' eax='0x00000ce4' ebx='0x00000e74' ecx='0x00000064' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
-+  <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x6f655820' edx='0x2952286e'/>
-+  <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x55504320' ebx='0x2d334520' ecx='0x35323231' edx='0x20357620'/>
-+  <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x2e332040' ebx='0x48473033' ecx='0x0000007a' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x01006040' edx='0x00000000'/>
-+  <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
-+  <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003027' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-+  <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000ce4' ebx='0x00000e74' ecx='0x00000064' edx='0x00000000'/>
-+  <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000ce4' ebx='0x00000e74' ecx='0x00000064' edx='0x00000000'/>
-+</cpudata>
--- 
-2.21.0
-

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

@@ -1,105 +0,0 @@
-From 7bde733e906a9eb513448fd58201a333a1793811 Mon Sep 17 00:00:00 2001
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 5 Apr 2019 15:11:20 +0200
-Subject: [PATCH 4/4] cpu_map: Define md-clear CPUID bit
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-CVE-2018-12126, CVE-2018-12127, CVE-2018-12130
-
-The bit is set when microcode provides the mechanism to invoke a flush
-of various exploitable CPU buffers by invoking the VERW instruction.
-
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 538d873571d7a682852dc1d70e5f4478f4d64e85)
-
-Conflicts:
-	src/cpu_map/x86_features.xml
-            - no CPU map split downstream
-
-	tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
-	tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
-            - test data missing downstream
-
-	tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-	tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-            - intel-pt feature is missing downstream
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
----
- src/cpu/cpu_map.xml                                        | 3 +++
- tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml | 2 +-
- tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml   | 1 +
- tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml    | 1 +
- tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml    | 1 +
- 5 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml
-index 96daa0f9af..250e241df9 100644
---- a/src/cpu/cpu_map.xml
-+++ b/src/cpu/cpu_map.xml
-@@ -295,6 +295,9 @@
-     <feature name='avx512-4fmaps'>
-       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000008'/>
-     </feature>
-+    <feature name='md-clear'> <!-- md_clear -->
-+      <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000400'/>
-+    </feature>
-     <feature name='spec-ctrl'>
-       <cpuid eax_in='0x07' ecx_in='0x00' edx='0x04000000'/>
-     </feature>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
-index 0deca9fba6..74763a462b 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-enabled.xml
-@@ -2,7 +2,7 @@
- <cpudata arch='x86'>
-   <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3203' edx='0x0f8bfbff'/>
-   <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
--  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c4fbb' ecx='0x00000000' edx='0x8c000000'/>
-+  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c4fbb' ecx='0x00000000' edx='0x8c000400'/>
-   <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000007' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-   <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
- </cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-index 141c01c841..3b3472742e 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-@@ -19,6 +19,7 @@
-   <feature policy='require' name='osxsave'/>
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='clflushopt'/>
-+  <feature policy='require' name='md-clear'/>
-   <feature policy='require' name='stibp'/>
-   <feature policy='require' name='ssbd'/>
-   <feature policy='require' name='xsaves'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-index 53bfc9728d..df4f97417c 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-@@ -20,6 +20,7 @@
-   <feature name='osxsave'/>
-   <feature name='tsc_adjust'/>
-   <feature name='clflushopt'/>
-+  <feature name='md-clear'/>
-   <feature name='stibp'/>
-   <feature name='ssbd'/>
-   <feature name='xsaves'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
-index 1f321db273..a5591278df 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
-@@ -5,6 +5,7 @@
-   <feature policy='require' name='hypervisor'/>
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='clflushopt'/>
-+  <feature policy='require' name='md-clear'/>
-   <feature policy='require' name='stibp'/>
-   <feature policy='require' name='ssbd'/>
-   <feature policy='require' name='pdpe1gb'/>
--- 
-2.21.0
-

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

@@ -1,56 +0,0 @@
-From 4cb90fa2335b75a0fc39440853bd681955b326a4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Tue, 14 May 2019 21:09:59 +0100
-Subject: [PATCH] cputest: remove stibp flag from test data
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-stibp flag doesn't exist in this maint branch.
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
----
- tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml | 1 -
- tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml  | 1 -
- tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml  | 1 -
- 3 files changed, 3 deletions(-)
-
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-index 3b3472742e..29c1fdb80a 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
-@@ -20,7 +20,6 @@
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='clflushopt'/>
-   <feature policy='require' name='md-clear'/>
--  <feature policy='require' name='stibp'/>
-   <feature policy='require' name='ssbd'/>
-   <feature policy='require' name='xsaves'/>
-   <feature policy='require' name='pdpe1gb'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-index df4f97417c..2003ca9ef6 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
-@@ -21,7 +21,6 @@
-   <feature name='tsc_adjust'/>
-   <feature name='clflushopt'/>
-   <feature name='md-clear'/>
--  <feature name='stibp'/>
-   <feature name='ssbd'/>
-   <feature name='xsaves'/>
-   <feature name='pdpe1gb'/>
-diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
-index a5591278df..d6529c59a3 100644
---- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
-@@ -6,7 +6,6 @@
-   <feature policy='require' name='tsc_adjust'/>
-   <feature policy='require' name='clflushopt'/>
-   <feature policy='require' name='md-clear'/>
--  <feature policy='require' name='stibp'/>
-   <feature policy='require' name='ssbd'/>
-   <feature policy='require' name='pdpe1gb'/>
- </cpu>
--- 
-2.21.0
-

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

@@ -1,58 +0,0 @@
-From 39fb5ab3125d1669344bab94ccb71bce814d9ae2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Tue, 30 Apr 2019 17:26:13 +0100
-Subject: [PATCH 1/3] admin: reject clients unless their UID matches the
- current UID
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The admin protocol RPC messages are only intended for use by the user
-running the daemon. As such they should not be allowed for any client
-UID that does not match the server UID.
-
-Fixes CVE-2019-10132
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 96f41cd765c9e525fe28ee5abbfbf4a79b3720c7)
----
- src/admin/admin_server_dispatch.c | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/src/admin/admin_server_dispatch.c b/src/admin/admin_server_dispatch.c
-index b78ff902c0..9f25813ae3 100644
---- a/src/admin/admin_server_dispatch.c
-+++ b/src/admin/admin_server_dispatch.c
-@@ -66,6 +66,28 @@ remoteAdmClientNew(virNetServerClientPtr client ATTRIBUTE_UNUSED,
-                    void *opaque)
- {
-     struct daemonAdmClientPrivate *priv;
-+    uid_t clientuid;
-+    gid_t clientgid;
-+    pid_t clientpid;
-+    unsigned long long timestamp;
-+
-+    if (virNetServerClientGetUNIXIdentity(client,
-+                                          &clientuid,
-+                                          &clientgid,
-+                                          &clientpid,
-+                                          &timestamp) < 0)
-+        return NULL;
-+
-+    VIR_DEBUG("New client pid %lld uid %lld",
-+              (long long)clientpid,
-+              (long long)clientuid);
-+
-+    if (geteuid() != clientuid) {
-+        virReportRestrictedError(_("Disallowing client %lld with uid %lld"),
-+                                 (long long)clientpid,
-+                                 (long long)clientuid);
-+        return NULL;
-+    }
- 
-     if (VIR_ALLOC(priv) < 0)
-         return NULL;
--- 
-2.21.0
-

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

@@ -1,51 +0,0 @@
-From 41f06e6095e17b61b2af35821d204afc5c34777c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Tue, 30 Apr 2019 16:51:37 +0100
-Subject: [PATCH 2/3] locking: restrict sockets to mode 0600
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The virtlockd daemon's only intended client is the libvirtd daemon. As
-such it should never allow clients from other user accounts to connect.
-The code already enforces this and drops clients from other UIDs, but
-we can get earlier (and thus stronger) protection against DoS by setting
-the socket permissions to 0600
-
-Fixes CVE-2019-10132
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit f111e09468693909b1f067aa575efdafd9a262a1)
----
- src/locking/virtlockd-admin.socket.in | 1 +
- src/locking/virtlockd.socket.in       | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/locking/virtlockd-admin.socket.in b/src/locking/virtlockd-admin.socket.in
-index 2a7500f3d0..f674c492f7 100644
---- a/src/locking/virtlockd-admin.socket.in
-+++ b/src/locking/virtlockd-admin.socket.in
-@@ -5,6 +5,7 @@ Before=libvirtd.service
- [Socket]
- ListenStream=@localstatedir@/run/libvirt/virtlockd-admin-sock
- Service=virtlockd.service
-+SocketMode=0600
- 
- [Install]
- WantedBy=sockets.target
-diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket.in
-index 45e0f20235..d701b27516 100644
---- a/src/locking/virtlockd.socket.in
-+++ b/src/locking/virtlockd.socket.in
-@@ -4,6 +4,7 @@ Before=libvirtd.service
- 
- [Socket]
- ListenStream=@localstatedir@/run/libvirt/virtlockd-sock
-+SocketMode=0600
- 
- [Install]
- WantedBy=sockets.target
--- 
-2.21.0
-

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

@@ -1,51 +0,0 @@
-From f0e014133104cdb5af5c7d96a7aa6dc0f1bbb03c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Tue, 30 Apr 2019 17:27:41 +0100
-Subject: [PATCH 3/3] logging: restrict sockets to mode 0600
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The virtlogd daemon's only intended client is the libvirtd daemon. As
-such it should never allow clients from other user accounts to connect.
-The code already enforces this and drops clients from other UIDs, but
-we can get earlier (and thus stronger) protection against DoS by setting
-the socket permissions to 0600
-
-Fixes CVE-2019-10132
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit e37bd65f9948c1185456b2cdaa3bd6e875af680f)
----
- src/logging/virtlogd-admin.socket.in | 1 +
- src/logging/virtlogd.socket.in       | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/logging/virtlogd-admin.socket.in b/src/logging/virtlogd-admin.socket.in
-index 595e6c4c4b..5c41dfeb7b 100644
---- a/src/logging/virtlogd-admin.socket.in
-+++ b/src/logging/virtlogd-admin.socket.in
-@@ -5,6 +5,7 @@ Before=libvirtd.service
- [Socket]
- ListenStream=@localstatedir@/run/libvirt/virtlogd-admin-sock
- Service=virtlogd.service
-+SocketMode=0600
- 
- [Install]
- WantedBy=sockets.target
-diff --git a/src/logging/virtlogd.socket.in b/src/logging/virtlogd.socket.in
-index 22b9360c8d..ae48cdab9a 100644
---- a/src/logging/virtlogd.socket.in
-+++ b/src/logging/virtlogd.socket.in
-@@ -4,6 +4,7 @@ Before=libvirtd.service
- 
- [Socket]
- ListenStream=@localstatedir@/run/libvirt/virtlogd-sock
-+SocketMode=0600
- 
- [Install]
- WantedBy=sockets.target
--- 
-2.21.0
-

sources

@@ -1 +1 @@
-SHA512 (libvirt-4.1.0.tar.xz) = 62d1a228adf3270cc6defe3cbf92dac8c4ce2c434c4d97219571ccef799a4f6304cfd1ba9938338356641285f53ac71145d7b398523021c5ea1dc8e3d49cf894
+b3ffa5e11880acca7fa19a3cca2d6280  libvirt-1.2.9.3.tar.gz