Add patches

polkit: Allow password-less access for 'libvirt' group (bz #957300 )
Rebased to version 1.2.9.3
2015-06-06 11:17:48 -04:00 · 2015-06-06 11:12:12 -04:00 · 2015-04-28 11:58:34 -04:00 · 2015-02-07 22:00:40 -05:00 · 2014-12-02 15:21:18 -05:00 · 2014-11-15 19:42:16 -05:00
18 changed files with 598 additions and 564 deletions
@@ -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 ||\
@@ -1,38 +0,0 @@
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Thu, 17 Dec 2015 13:43:58 +0100
-Subject: [PATCH] schema: interleave domain name and uuid with other elements
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Allow <name> and <uuid> anywhere under <domain>, not just at the top:
-
-error:XML document failed to validate against schema: Unable to validate
-doc against /usr/share/libvirt/schemas/domain.rng
-Expecting an element name, got nothing
-Invalid sequence in interleave
-Element domain failed to validate content
-
-Introduced with the first RelaxNG schema in commit c642103.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1292131
-(cherry picked from commit b4e0549febe416ffefc16f389423740d6d65fa74)
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
---
- docs/schemas/domaincommon.rng | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
-index b252a17..48610ce 100644
--- a/docs/schemas/domaincommon.rng
-+++ b/docs/schemas/domaincommon.rng
-@@ -30,8 +30,8 @@
-   <define name="domain">
-     <element name="domain">
-       <ref name="hvs"/>
-      <ref name="ids"/>
-       <interleave>
-+        <ref name="ids"/>
-         <optional>
-           <ref name="title"/>
-         </optional>
@@ -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;
@@ -1,32 +0,0 @@
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Thu, 14 Jan 2016 14:31:17 +0100
-Subject: [PATCH] leaseshelper: fix crash when no mac is specified
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If dnsmasq specified DNSMASQ_IAID (so we're dealing with an IPv6
-lease) but no DNSMASQ_MAC, we skip creation of the new lease object.
-
-Also skip adding it to the leases array.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1202350
-(cherry picked from commit df9fe124d650bc438c531673492569da87523d20)
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
---
- src/network/leaseshelper.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c
-index 2d528f7..6930310 100644
--- a/src/network/leaseshelper.c
-+++ b/src/network/leaseshelper.c
-@@ -439,7 +439,7 @@ main(int argc, char **argv)
- 
-     case VIR_LEASE_ACTION_OLD:
-     case VIR_LEASE_ACTION_ADD:
-        if (virJSONValueArrayAppend(leases_array_new, lease_new) < 0) {
-+        if (lease_new && virJSONValueArrayAppend(leases_array_new, lease_new) < 0) {
-             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                            _("failed to create json"));
-             goto cleanup;
@@ -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;
+ }
+ 
@@ -1,63 +0,0 @@
-From: Cole Robinson <crobinso@redhat.com>
-Date: Tue, 19 Jan 2016 22:19:56 -0500
-Subject: [PATCH] build: predictably generate systemtap tapsets (bz 1173641)
-
-The generated output is dependent on perl hashtable ordering, which
-gives different results for i686 and x86_64. Fix this by sorting
-the hash keys before iterating over them
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1173641
-(cherry picked from commit a1edb05c6028470aa24b74aa0f8d5fb5a181128a)
---
- src/rpc/gensystemtap.pl | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/rpc/gensystemtap.pl b/src/rpc/gensystemtap.pl
-index 2467300..7b80fbf 100755
--- a/src/rpc/gensystemtap.pl
-+++ b/src/rpc/gensystemtap.pl
-@@ -72,7 +72,7 @@ function libvirt_rpc_auth_name(type, verbose)
- {
- EOF
- my $first = 1;
-foreach my $type (keys %auth) {
-+foreach my $type (sort(keys %auth)) {
-     my $cond = $first ? "if" : "} else if";
-     $first = 0;
-     print "  $cond (type == ", $type, ") {\n";
-@@ -95,7 +95,7 @@ function libvirt_rpc_type_name(type, verbose)
- {
- EOF
- $first = 1;
-foreach my $type (keys %type) {
-+foreach my $type (sort(keys %type)) {
-     my $cond = $first ? "if" : "} else if";
-     $first = 0;
-     print "  $cond (type == ", $type, ") {\n";
-@@ -118,7 +118,7 @@ function libvirt_rpc_status_name(status, verbose)
- {
- EOF
- $first = 1;
-foreach my $status (keys %status) {
-+foreach my $status (sort(keys %status)) {
-     my $cond = $first ? "if" : "} else if";
-     $first = 0;
-     print "  $cond (status == ", $status, ") {\n";
-@@ -141,7 +141,7 @@ function libvirt_rpc_program_name(program, verbose)
- {
- EOF
- $first = 1;
-foreach my $prog (keys %funcs) {
-+foreach my $prog (sort(keys %funcs)) {
-     my $cond = $first ? "if" : "} else if";
-     $first = 0;
-     print "  $cond (program == ", $funcs{$prog}->{id}, ") {\n";
-@@ -165,7 +165,7 @@ function libvirt_rpc_procedure_name(program, version, proc, verbose)
- {
- EOF
- $first = 1;
-foreach my $prog (keys %funcs) {
-+foreach my $prog (sort(keys %funcs)) {
-     my $cond = $first ? "if" : "} else if";
-     $first = 0;
-     print "  $cond (program == ", $funcs{$prog}->{id}, " && version == ", $funcs{$prog}->{version}, ") {\n";
@@ -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
@@ -1,30 +0,0 @@
-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Fri, 3 Jul 2015 16:51:56 +0100
-Subject: [PATCH] rpc: ensure daemon is spawn even if dead socket exists
-
-The auto-spawn code would originally attempt to spawn the
-daemon for both ENOENT and ECONNREFUSED errors from connect().
-The various refactorings eventually lost this so we only
-spawn the daemon on ENOENT. The result is if the daemon exits
-uncleanly, so that the socket is left in the filesystem, we
-will never be able to auto-spawn the daemon again.
-
-(cherry picked from commit 406ee8c226d2197ba1aaecb9cf3ad2b6df31ae44)
---
- src/rpc/virnetsocket.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
-index 51f94d4..6153e0e 100644
--- a/src/rpc/virnetsocket.c
-+++ b/src/rpc/virnetsocket.c
-@@ -610,7 +610,8 @@ int virNetSocketNewConnectUNIX(const char *path,
- 
-     while (retries &&
-            connect(fd, &remoteAddr.data.sa, remoteAddr.len) < 0) {
-        if (!(spawnDaemon && errno == ENOENT)) {
-+        if (!(spawnDaemon && (errno == ENOENT ||
-+                              errno == ECONNREFUSED))) {
-             virReportSystemError(errno, _("Failed to connect socket to '%s'"),
-                                  path);
-             goto cleanup;
@@ -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);
@@ -1,48 +0,0 @@
-From: Cole Robinson <crobinso@redhat.com>
-Date: Mon, 11 Jan 2016 20:01:24 -0500
-Subject: [PATCH] rpc: socket: Minor cleanups
-
- Add some debugging
- Make the loop dependent only on retries
- Make it explicit that connect(2) success exits the loop
- Invert the error checking logic
-
-(cherry picked from commit f102c7146ed7f6e04af0ad3bce302476239f2502)
---
- src/rpc/virnetsocket.c | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
-index 6153e0e..dcff69e 100644
--- a/src/rpc/virnetsocket.c
-+++ b/src/rpc/virnetsocket.c
-@@ -548,6 +548,9 @@ int virNetSocketNewConnectUNIX(const char *path,
-     char *rundir = NULL;
-     int ret = -1;
- 
-+    VIR_DEBUG("path=%s spawnDaemon=%d binary=%s", path, spawnDaemon,
-+        NULLSTR(binary));
-+
-     memset(&localAddr, 0, sizeof(localAddr));
-     memset(&remoteAddr, 0, sizeof(remoteAddr));
- 
-@@ -608,10 +611,15 @@ int virNetSocketNewConnectUNIX(const char *path,
-     if (remoteAddr.data.un.sun_path[0] == '@')
-         remoteAddr.data.un.sun_path[0] = '\0';
- 
-    while (retries &&
-           connect(fd, &remoteAddr.data.sa, remoteAddr.len) < 0) {
-        if (!(spawnDaemon && (errno == ENOENT ||
-                              errno == ECONNREFUSED))) {
-+    while (retries) {
-+        if (connect(fd, &remoteAddr.data.sa, remoteAddr.len) == 0) {
-+            VIR_DEBUG("connect() succeeded");
-+            break;
-+        }
-+        VIR_DEBUG("connect() failed: retries=%d errno=%d", retries, errno);
-+
-+        if (!spawnDaemon ||
-+            (errno != ENOENT && errno != ECONNREFUSED)) {
-             virReportSystemError(errno, _("Failed to connect socket to '%s'"),
-                                  path);
-             goto cleanup;
@@ -79,10 +79,10 @@ index 0000000..01a15fa
 +    }
 +});
 diff --git a/libvirt.spec.in b/libvirt.spec.in
-index dc327a2..a23629d 100644
+index a84b19d..5de085b 100644
 --- a/libvirt.spec.in
 +++ b/libvirt.spec.in
-@@ -1631,9 +1631,9 @@ then
+@@ -1583,9 +1583,9 @@ then
 fi
 
 %if %{with_libvirtd}
@@ -93,7 +93,7 @@ index dc327a2..a23629d 100644
             %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
-@@ -1647,11 +1647,21 @@ if ! getent passwd qemu >/dev/null; then
+@@ -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
@@ -115,8 +115,8 @@ index dc327a2..a23629d 100644
 +
 %post daemon
 
-     %if %{with_systemd}
-@@ -1925,6 +1935,7 @@ exit 0
+     %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
@@ -1,40 +0,0 @@
-From: Cole Robinson <crobinso@redhat.com>
-Date: Mon, 11 Jan 2016 20:08:45 -0500
-Subject: [PATCH] rpc: socket: Explicitly error if we exceed retry count
-
-When we autolaunch libvirtd for session URIs, we spin in a retry
-loop waiting for the daemon to start and the connect(2) to succeed.
-
-However if we exceed the retry count, we don't explicitly raise an
-error, which can yield a slew of different error messages elsewhere
-in the code.
-
-Explicitly raise the last connect(2) failure if we run out of retries.
-
-(cherry picked from commit 8da02d528068942303923fc4f935e77cccac9c7c)
---
- src/rpc/virnetsocket.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
-index dcff69e..90951be 100644
--- a/src/rpc/virnetsocket.c
-+++ b/src/rpc/virnetsocket.c
-@@ -618,7 +618,9 @@ int virNetSocketNewConnectUNIX(const char *path,
-         }
-         VIR_DEBUG("connect() failed: retries=%d errno=%d", retries, errno);
- 
-+        retries--;
-         if (!spawnDaemon ||
-+            retries == 0 ||
-             (errno != ENOENT && errno != ECONNREFUSED)) {
-             virReportSystemError(errno, _("Failed to connect socket to '%s'"),
-                                  path);
-@@ -628,7 +630,6 @@ int virNetSocketNewConnectUNIX(const char *path,
-         if (virNetSocketForkDaemon(binary) < 0)
-             goto cleanup;
- 
-        retries--;
-         usleep(5000);
-     }
- 
@@ -1,43 +0,0 @@
-From: Cole Robinson <crobinso@redhat.com>
-Date: Mon, 11 Jan 2016 20:13:38 -0500
-Subject: [PATCH] rpc: socket: Don't repeatedly attempt to launch daemon
-
-On every socket connect(2) attempt we were re-launching session
-libvirtd, up to 100 times in 5 seconds.
-
-This understandably caused some weird load races and intermittent
-qemu:///session startup failures
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1271183
-(cherry picked from commit 2eb7a975756d05a5b54ab4acf60083beb6161ac6)
---
- src/rpc/virnetsocket.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
-index 90951be..2ee4b6e 100644
--- a/src/rpc/virnetsocket.c
-+++ b/src/rpc/virnetsocket.c
-@@ -547,6 +547,7 @@ int virNetSocketNewConnectUNIX(const char *path,
-     virSocketAddr remoteAddr;
-     char *rundir = NULL;
-     int ret = -1;
-+    bool daemonLaunched = false;
- 
-     VIR_DEBUG("path=%s spawnDaemon=%d binary=%s", path, spawnDaemon,
-         NULLSTR(binary));
-@@ -627,8 +628,12 @@ int virNetSocketNewConnectUNIX(const char *path,
-             goto cleanup;
-         }
- 
-        if (virNetSocketForkDaemon(binary) < 0)
-            goto cleanup;
-+        if (!daemonLaunched) {
-+            if (virNetSocketForkDaemon(binary) < 0)
-+                goto cleanup;
-+
-+            daemonLaunched = true;
-+        }
- 
-         usleep(5000);
-     }
@@ -1,57 +0,0 @@
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 15 Jan 2016 10:55:58 +0100
-Subject: [PATCH] security: Do not restore kernel and initrd labels
-
-Kernel/initrd files are essentially read-only shareable images and thus
-should be handled in the same way. We already use the appropriate label
-for kernel/initrd files when starting a domain, but when a domain gets
-destroyed we would remove the labels which would make other running
-domains using the same files very unhappy.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=921135
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 68acc701bd449481e3206723c25b18fcd3d261b7)
---
- src/security/security_dac.c     | 8 --------
- src/security/security_selinux.c | 8 --------
- 2 files changed, 16 deletions(-)
-
-diff --git a/src/security/security_dac.c b/src/security/security_dac.c
-index deb6980..d01215f 100644
--- a/src/security/security_dac.c
-+++ b/src/security/security_dac.c
-@@ -971,14 +971,6 @@ virSecurityDACRestoreSecurityAllLabel(virSecurityManagerPtr mgr,
-         virSecurityDACRestoreSecurityFileLabel(def->os.loader->nvram) < 0)
-         rc = -1;
- 
-    if (def->os.kernel &&
-        virSecurityDACRestoreSecurityFileLabel(def->os.kernel) < 0)
-        rc = -1;
-
-    if (def->os.initrd &&
-        virSecurityDACRestoreSecurityFileLabel(def->os.initrd) < 0)
-        rc = -1;
-
-     if (def->os.dtb &&
-         virSecurityDACRestoreSecurityFileLabel(def->os.dtb) < 0)
-         rc = -1;
-diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
-index 6e67a86..2475a80 100644
--- a/src/security/security_selinux.c
-+++ b/src/security/security_selinux.c
-@@ -1953,14 +1953,6 @@ virSecuritySELinuxRestoreSecurityAllLabel(virSecurityManagerPtr mgr,
-         virSecuritySELinuxRestoreSecurityFileLabel(mgr, def->os.loader->nvram) < 0)
-         rc = -1;
- 
-    if (def->os.kernel &&
-        virSecuritySELinuxRestoreSecurityFileLabel(mgr, def->os.kernel) < 0)
-        rc = -1;
-
-    if (def->os.initrd &&
-        virSecuritySELinuxRestoreSecurityFileLabel(mgr, def->os.initrd) < 0)
-        rc = -1;
-
-     if (def->os.dtb &&
-         virSecuritySELinuxRestoreSecurityFileLabel(mgr, def->os.dtb) < 0)
-         rc = -1;
@@ -1,37 +0,0 @@
-From: Cole Robinson <crobinso@redhat.com>
-Date: Tue, 15 Mar 2016 17:04:32 -0400
-Subject: [PATCH] rpc: wait longer for session daemon to start up
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1271183
-
-We only wait 0.5 seconds for the session daemon to start up and present
-its socket, which isn't sufficient for many users. Bump up the sleep
-interval and retry amount so we wait for a total of 5.0 seconds.
-
-(cherry picked from commit ca0c06f4008154de55e0b3109885facd0bf02d32)
---
- src/rpc/virnetsocket.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
-index 2ee4b6e..275f1f5 100644
--- a/src/rpc/virnetsocket.c
-+++ b/src/rpc/virnetsocket.c
-@@ -542,7 +542,7 @@ int virNetSocketNewConnectUNIX(const char *path,
-     char *lockpath = NULL;
-     int lockfd = -1;
-     int fd = -1;
-    int retries = 100;
-+    int retries = 500;
-     virSocketAddr localAddr;
-     virSocketAddr remoteAddr;
-     char *rundir = NULL;
-@@ -635,7 +635,7 @@ int virNetSocketNewConnectUNIX(const char *path,
-             daemonLaunched = true;
-         }
- 
-        usleep(5000);
-+        usleep(10000);
-     }
- 
-     localAddr.len = sizeof(localAddr.data);
@@ -1,27 +0,0 @@
-From: Jovanka Gulicoska <jovanka.gulicoska@gmail.com>
-Date: Thu, 17 Mar 2016 20:02:20 +0100
-Subject: [PATCH] driver: log missing modules as INFO, not WARN
-
-Missing modules is a common expected scenario for most libvirt usage on
-RPM distributions like Fedora, so it doesn't really warrant logging at
-WARN level. Use INFO instead
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1274849
-(cherry picked from commit 9a0c7f5f834185db9017c34aabc03ad99cf37bed)
---
- src/driver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/driver.c b/src/driver.c
-index db03438..f926fe4 100644
--- a/src/driver.c
-+++ b/src/driver.c
-@@ -62,7 +62,7 @@ virDriverLoadModule(const char *name)
-         return NULL;
- 
-     if (access(modfile, R_OK) < 0) {
-        VIR_WARN("Module %s not accessible", modfile);
-+        VIR_INFO("Module %s not accessible", modfile);
-         goto cleanup;
-     }
- 
@@ -337,12 +337,6 @@
 %endif


-# Advertise OVMF and AAVMF from nightly firmware repo
-%if 0%{?fedora}
-    %define with_loader_nvram --with-loader-nvram="/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd:/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2.git/aarch64/vars-template-pflash.raw"
-%endif
-
-
 # The RHEL-5 Xen package has some feature backports. This
 # flag is set to enable use of those special bits on RHEL-5
 %if 0%{?rhel} == 5
@@ -363,15 +357,13 @@
 # changes in reported warnings
 %if 0%{?rhel}
    %define enable_werror --enable-werror
-%else
-    %define enable_werror --disable-werror
 %endif


 Summary: Library providing a simple virtualization API
 Name: libvirt
-Version: 1.2.13.2
-Release: 3%{?dist}%{?extra_release}
+Version: 1.2.9.3
+Release: 2%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -382,27 +374,14 @@ URL: http://libvirt.org/
 %endif
 Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz

-# Fix XML validation with qemu commandline passthrough (bz #1292131)
-Patch0001: 0001-schema-interleave-domain-name-and-uuid-with-other-el.patch
-# Fix crash in libvirt_leasehelper (bz #1202350)
-Patch0002: 0002-leaseshelper-fix-crash-when-no-mac-is-specified.patch
-# Generate consistent systemtap tapsets regardless of host arch (bz
-# #1173641)
-Patch0003: 0003-build-predictably-generate-systemtap-tapsets-bz-1173.patch
-# Fix qemu:///session error 'Transport endpoint is not connected' (bz
-# #1271183)
-Patch0004: 0004-rpc-ensure-daemon-is-spawn-even-if-dead-socket-exist.patch
-Patch0005: 0005-rpc-socket-Minor-cleanups.patch
-Patch0006: 0006-rpc-socket-Explicitly-error-if-we-exceed-retry-count.patch
-Patch0007: 0007-rpc-socket-Don-t-repeatedly-attempt-to-launch-daemon.patch
-# Fix parallel VM start/top svirt errors on kernel/initrd (bz #1269975)
-Patch0008: 0008-security-Do-not-restore-kernel-and-initrd-labels.patch
-# Fix qemu:///session connect race failures (bz #1271183)
-Patch0009: 0009-rpc-wait-longer-for-session-daemon-to-start-up.patch
-# driver: log missing modules as INFO, not WARN (bz #1274849)
-Patch0010: 0010-driver-log-missing-modules-as-INFO-not-WARN.patch
+# ppc64le fixes (bz #1163439)
+Patch0001: 0001-Cpu-Add-support-for-Power-LE-Architecture.patch
+Patch0002: 0002-PowerPC-Add-support-for-launching-VM-in-compat-mode.patch
+Patch0003: 0003-PowerPC-Improve-PVR-handling-to-fall-back-to-cpu-gen.patch
+Patch0004: 0004-docs-Add-documentation-for-compat-mode.patch
+Patch0005: 0005-Test-Add-a-testcase-for-PowerPC-compat-mode-cpu-spec.patch
 # polkit: Allow password-less access for 'libvirt' group (bz #957300)
-Patch0011: 0011-polkit-Allow-password-less-access-for-libvirt-group.patch
+Patch0006: 0006-polkit-Allow-password-less-access-for-libvirt-group.patch

 %if %{with_libvirtd}
 Requires: libvirt-daemon = %{version}-%{release}
@@ -455,7 +434,6 @@ BuildRequires: gettext-devel
 BuildRequires: libtool
 BuildRequires: /usr/bin/pod2man
 %endif
-BuildRequires: git
 BuildRequires: perl
 BuildRequires: python
 %if %{with_systemd}
@@ -546,8 +524,6 @@ BuildRequires: cyrus-sasl-devel
 %endif
 %if %{with_polkit}
    %if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
-# F22 polkit-devel doesn't pull in polkit anymore, which we need for pkcheck
-BuildRequires: polkit >= 0.112
 BuildRequires: polkit-devel >= 0.112
    %else
        %if 0%{?fedora} || 0%{?rhel} >= 6
@@ -1231,41 +1207,14 @@ driver
 %prep
 %setup -q

-# Patches have to be stored in a temporary file because RPM has
-# a limit on the length of the result of any macro expansion;
-# if the string is longer, it's silently cropped
-%{lua:
-    tmp = os.tmpname();
-    f = io.open(tmp, "w+");
-    count = 0;
-    for i, p in ipairs(patches) do
-        f:write(p.."\n");
-        count = count + 1;
-    end;
-    f:close();
-    print("PATCHCOUNT="..count.."\n")
-    print("PATCHLIST="..tmp.."\n")
-}
-
-git init -q
-git config user.name rpm-build
-git config user.email rpm-build
-git config gc.auto 0
-git add .
-git commit -q -a --author 'rpm-build <rpm-build>' \
-           -m '%{name}-%{version} base'
-
-COUNT=$(grep '\.patch$' $PATCHLIST | wc -l)
-if [ $COUNT -ne $PATCHCOUNT ]; then
-    echo "Found $COUNT patches in $PATCHLIST, expected $PATCHCOUNT"
-    exit 1
-fi
-if [ $COUNT -gt 0 ]; then
-    xargs git am <$PATCHLIST || exit 1
-fi
-echo "Applied $COUNT patches"
-rm -f $PATCHLIST
-rm -rf .git
+# ppc64le fixes (bz #1163439)
+%patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
+%patch0004 -p1
+%patch0005 -p1
+# polkit: Allow password-less access for 'libvirt' group (bz #957300)
+%patch0006 -p1

 %build
 %if ! %{with_xen}
@@ -1541,7 +1490,6 @@ rm -f po/stamp-po
           %{with_packager_version} \
           --with-qemu-user=%{qemu_user} \
           --with-qemu-group=%{qemu_group} \
-           %{?with_loader_nvram} \
           %{?enable_werror} \
           --enable-expensive-tests \
           %{init_scripts}
@@ -1686,6 +1634,48 @@ exit 0

 %post daemon

+    %if %{with_network}
+# All newly defined networks will have a mac address for the bridge
+# auto-generated, but networks already existing at the time of upgrade
+# will not. We need to go through all the network configs, look for
+# those that don't have a mac address, and add one.
+
+network_files=$( (cd %{_localstatedir}/lib/libvirt/network && \
+                  grep -L "mac address" *.xml; \
+                  cd %{_sysconfdir}/libvirt/qemu/networks && \
+                  grep -L "mac address" *.xml) 2>/dev/null \
+                | sort -u)
+
+for file in $network_files
+do
+   # each file exists in either the config or state directory (or both) and
+   # does not have a mac address specified in either. We add the same mac
+   # address to both files (or just one, if the other isn't there)
+
+   mac4=`printf '%X' $(($RANDOM % 256))`
+   mac5=`printf '%X' $(($RANDOM % 256))`
+   mac6=`printf '%X' $(($RANDOM % 256))`
+   for dir in %{_localstatedir}/lib/libvirt/network \
+              %{_sysconfdir}/libvirt/qemu/networks
+   do
+      if test -f $dir/$file
+      then
+         sed -i.orig -e \
+           "s|\(<bridge.*$\)|\0\n  <mac address='52:54:00:$mac4:$mac5:$mac6'/>|" \
+           $dir/$file
+         if test $? != 0
+         then
+             echo "failed to add <mac address='52:54:00:$mac4:$mac5:$mac6'/>" \
+                  "to $dir/$file"
+             mv -f $dir/$file.orig $dir/$file
+         else
+             rm -f $dir/$file.orig
+         fi
+      fi
+   done
+done
+    %endif
+
    %if %{with_systemd}
        %if %{with_systemd_macros}
            %systemd_post virtlockd.socket libvirtd.service libvirtd.socket
@@ -2154,6 +2144,8 @@ exit 0
 %files daemon-driver-vbox
 %defattr(-, root, root)
 %{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so
+%{_libdir}/%{name}/connection-driver/libvirt_driver_vbox_network.so
+%{_libdir}/%{name}/connection-driver/libvirt_driver_vbox_storage.so
        %endif
    %endif # %{with_driver_modules}

@@ -2282,17 +2274,6 @@ exit 0
 %dir %{_includedir}/libvirt
 %{_includedir}/libvirt/virterror.h
 %{_includedir}/libvirt/libvirt.h
-%{_includedir}/libvirt/libvirt-domain.h
-%{_includedir}/libvirt/libvirt-domain-snapshot.h
-%{_includedir}/libvirt/libvirt-event.h
-%{_includedir}/libvirt/libvirt-host.h
-%{_includedir}/libvirt/libvirt-interface.h
-%{_includedir}/libvirt/libvirt-network.h
-%{_includedir}/libvirt/libvirt-nodedev.h
-%{_includedir}/libvirt/libvirt-nwfilter.h
-%{_includedir}/libvirt/libvirt-secret.h
-%{_includedir}/libvirt/libvirt-storage.h
-%{_includedir}/libvirt/libvirt-stream.h
 %{_includedir}/libvirt/libvirt-qemu.h
 %{_includedir}/libvirt/libvirt-lxc.h
 %{_libdir}/pkgconfig/libvirt.pc
@@ -2316,84 +2297,43 @@ exit 0
 %doc examples/systemtap

 %changelog
-* Thu Mar 17 2016 Cole Robinson <crobinso@redhat.com> - 1.2.13.2-3
- Fix qemu:///session connect race failures (bz #1271183)
- driver: log missing modules as INFO, not WARN (bz #1274849)
-
-* Wed Jan 20 2016 Cole Robinson <crobinso@redhat.com> - 1.2.13.2-2
- Fix XML validation with qemu commandline passthrough (bz #1292131)
- Fix crash in libvirt_leasehelper (bz #1202350)
- Generate consistent systemtap tapsets regardless of host arch (bz
-  #1173641)
- Fix qemu:///session error 'Transport endpoint is not connected' (bz
-  #1271183)
- Fix parallel VM start/top svirt errors on kernel/initrd (bz #1269975)
-
-* Wed Dec 23 2015 Cole Robinson <crobinso@redhat.com> - 1.2.13.2-1
- Rebased to version 1.2.13.2
- disk backend is not removed properly when disk frontent hotplug fails (bz
-  #1265968)
- Fix TPM cancel path on newer kernels (bz #1244895)
- Remove timeout for libvirt-guests.service (bz #1195544)
- CVE-2015-5313 libvirt: filesystem storage volume names path traversal flaw
-  (bz #1291433)
- Fix VM names with non-ascii (bz #1062943)
- Fix backwards migration with graphics listen address (bz #1276883)
-
-* Mon Sep 21 2015 Cole Robinson <crobinso@redhat.com> - 1.2.13.1-3
- Add sanity checks for drive mirroring (bz #1263438)
-
-* Fri Jun 05 2015 Cole Robinson <crobinso@redhat.com> - 1.2.13.1-2
- lxc network fixes (bz #1225591, bz #1225593, bz #1225594)
+* Fri Jun 05 2015 Cole Robinson <crobinso@redhat.com> - 1.2.9.3-2
 - polkit: Allow password-less access for 'libvirt' group (bz #957300)

-* Tue Apr 28 2015 Cole Robinson <crobinso@redhat.com> - 1.2.13.1-1
- Rebased to version 1.2.13.1
+* Tue Apr 28 2015 Cole Robinson <crobinso@redhat.com> - 1.2.9.3-1
+- Rebased to version 1.2.9.3
 - 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 regression with 'virsh event ' (bz #1212620)
+- 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)

-* Wed Apr 15 2015 Cole Robinson <crobinso@redhat.com> - 1.2.13-3
- Fix LXC domain startup (bz #1210397)
- Fix crash via identify object cleanup race (bz #1203030)
- Fix race starting multiple session daemons (bz #1200149)
- Fix change-media success messages
- Strip invalid control codes from XML (bz #1066564, bz #1184131)
+* Sat Feb 07 2015 Cole Robinson <crobinso@redhat.com> - 1.2.9.2-1
+- Rebased to version 1.2.9.2
+- CVE-2014-8131: deadlock and segfault in qemuConnectGetAllDomainStats (bz
+  #1172571)
+- CVE-2015-0236: missing ACL check for the VIR_DOMAIN_XML_SECURE flag in save
+  images and snapshots objects (bz #1185769)
+- CVE-2014-8136: local denial of service in qemu/qemu_driver.c (bz #1176179)
+- Fix crash parsing nbd URIs (bz #1188644)
+- Fix domain startup failing with 'strict' mode in numatune (bz #1168672)

-* Tue Mar 10 2015 Cole Robinson <crobinso@redhat.com> - 1.2.13-2
- Fix connecting to qemu:///session (bz #1198244)
+* Tue Dec 02 2014 Cole Robinson <crobinso@redhat.com> - 1.2.9.1-2
+- Don't reject aarch64 + uefi

-* Mon Mar 02 2015 Cole Robinson <crobinso@redhat.com> - 1.2.13-1
- Rebased to version 1.2.13
- lot of improvements around NUMA code
- a lot of improvement and bug fixes
-
-* Tue Feb  3 2015 Daniel P. Berrange <berrange@redhat.com> - 1.2.12-2
- Rebuild for changed xen soname
-
-* Tue Jan 27 2015 Daniel P. Berrange <berrange@redhat.com> - 1.2.12-1
- Update to 1.2.12 release
-
-* Mon Dec 15 2014 Daniel P. Berrange <berrange@redhat.com> - 1.2.11-1
- Update to 1.2.11 release
- Use git to apply patches
-
-* Fri Nov 21 2014 Cole Robinson <crobinso@redhat.com> - 1.2.10-3
- Allow arm/aarch64 with UEFI
-
-* Sat Nov 15 2014 Cole Robinson <crobinso@redhat.com> - 1.2.10-2
- Fix caps probing when KVM is disabled (bz #1160318)
+* Sat Nov 15 2014 Cole Robinson <crobinso@redhat.com> - 1.2.9.1-1
+- Rebased to version 1.2.9.1
 - ppc64le fixes (bz #1163439)
-
-* Mon Nov  3 2014 Daniel Veillard <veillard@redhat.com> - 1.2.10
- upstream release
+- Fix caps probing when KVM is disabled (bz #1160318)

 * Thu Oct 30 2014 Cole Robinson <crobinso@redhat.com> - 1.2.9-4
 - Fix creating i686 guest with x86_64 emulator (bz #1153797)
@@ -1 +1 @@
-05f461cd499c628ef07822dd607c340a  libvirt-1.2.13.2.tar.gz
+b3ffa5e11880acca7fa19a3cca2d6280  libvirt-1.2.9.3.tar.gz
Author	SHA1	Message	Date
Cole Robinson	0831c388ec	Add patches	2015-06-06 11:17:48 -04:00
Cole Robinson	b59373e03c	polkit: Allow password-less access for 'libvirt' group (bz #957300 )	2015-06-06 11:12:12 -04:00
Cole Robinson	d617f580c5	Rebased to version 1.2.9.3 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)	2015-04-28 11:58:34 -04:00
Cole Robinson	7415198273	Rebased to version 1.2.9.2 CVE-2014-8131: deadlock and segfault in qemuConnectGetAllDomainStats (bz #1172571) CVE-2015-0236: missing ACL check for the VIR_DOMAIN_XML_SECURE flag in save images and snapshots objects (bz #1185769) CVE-2014-8136: local denial of service in qemu/qemu_driver.c (bz #1176179) Fix crash parsing nbd URIs (bz #1188644) Fix domain startup failing with 'strict' mode in numatune (bz #1168672)	2015-02-07 22:00:40 -05:00
Cole Robinson	0ceadbef50	Don't reject aarch64 + uefi	2014-12-02 15:21:18 -05:00
Cole Robinson	82f2674fae	Rebased to version 1.2.9.1 ppc64le fixes (bz #1163439) Fix caps probing when KVM is disabled (bz #1160318)	2014-11-15 19:42:16 -05:00