Rebased to version 1.2.18.4

CVE-2016-5008: Setting empty VNC password allows access to unauthorized users (bz #1351516)

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

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

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

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

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

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

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

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

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

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

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

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

libvirt.spec

@@ -2,7 +2,7 @@
 
 # This spec file assumes you are building for Fedora 13 or newer,
 # or for RHEL 5 or newer. It may need some tweaks for other distros.
-# If neither fedora nor rhel was defined, try to guess them from %{dist}
+# If neither fedora nor rhel was defined, try to guess them from dist
 %if !0%{?rhel} && !0%{?fedora}
 %{expand:%(echo "%{?dist}" | \
   sed -ne 's/^\.el\([0-9]\+\).*/%%define rhel \1/p')}
@@ -13,13 +13,13 @@
 # Default to skipping autoreconf.  Distros can change just this one line
 # (or provide a command-line override) if they backport any patches that
 # touch configure.ac or Makefile.am.
-%{!?enable_autotools:%define enable_autotools 1}
+%{!?enable_autotools:%global enable_autotools 0}
 
 # A client only build will create a libvirt.so only containing
 # the generic RPC driver, and test driver and no libvirtd
 # Default to a full server + client build, but with the possibility
 # of a command-line or ~/.rpmmacros override for client-only.
-%{!?client_only:%define client_only 0}
+%{!?client_only:%global client_only 0}
 
 # Now turn off server build in certain cases
 
@@ -97,7 +97,7 @@
 %define with_esx           0%{!?_without_esx:1}
 %define with_hyperv        0%{!?_without_hyperv:1}
 %define with_xenapi        0%{!?_without_xenapi:1}
-%define with_parallels     0%{!?_without_parallels:1}
+%define with_vz            0%{!?_without_vz:1}
 # No test for bhyve, because it does not build on Linux
 
 # Then the secondary host drivers, which run inside libvirtd
@@ -108,7 +108,7 @@
 %define with_storage_iscsi    0%{!?_without_storage_iscsi:%{server_drivers}}
 %define with_storage_disk     0%{!?_without_storage_disk:%{server_drivers}}
 %define with_storage_mpath    0%{!?_without_storage_mpath:%{server_drivers}}
-%if 0%{?fedora} >= 16
+%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
     %define with_storage_rbd      0%{!?_without_storage_rbd:%{server_drivers}}
 %else
     %define with_storage_rbd      0
@@ -182,6 +182,13 @@
     %endif
 %endif
 
+# librados and librbd are built only on x86_64 on rhel
+%ifnarch x86_64
+    %if 0%{?rhel} >= 7
+        %define with_storage_rbd 0
+    %endif
+%endif
+
 # RHEL doesn't ship OpenVZ, VBox, UML, PowerHypervisor,
 # VMWare, libxenserver (xenapi), libxenlight (Xen 4.1 and newer),
 # or HyperV.
@@ -194,7 +201,7 @@
     %define with_xenapi 0
     %define with_libxl 0
     %define with_hyperv 0
-    %define with_parallels 0
+    %define with_vz 0
 %endif
 
 # Fedora 17 / RHEL-7 are first where we use systemd. Although earlier
@@ -357,13 +364,15 @@
 # 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.9.3
-Release: 2%{?dist}%{?extra_release}
+Version: 1.2.18.4
+Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -374,15 +383,6 @@ URL: http://libvirt.org/
 %endif
 Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz
 
-# 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)
-Patch0006: 0006-polkit-Allow-password-less-access-for-libvirt-group.patch
-
 %if %{with_libvirtd}
 Requires: libvirt-daemon = %{version}-%{release}
     %if %{with_network}
@@ -434,6 +434,7 @@ BuildRequires: gettext-devel
 BuildRequires: libtool
 BuildRequires: /usr/bin/pod2man
 %endif
+BuildRequires: git
 BuildRequires: perl
 BuildRequires: python
 %if %{with_systemd}
@@ -524,6 +525,8 @@ 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
@@ -572,7 +575,12 @@ BuildRequires: device-mapper-devel
     %endif
 %endif
 %if %{with_storage_rbd}
+    %if 0%{?rhel} >= 7
+BuildRequires: librados2-devel
+BuildRequires: librbd1-devel
+    %else
 BuildRequires: ceph-devel
+    %endif
 %endif
 %if %{with_storage_gluster}
     %if 0%{?rhel} >= 6
@@ -1179,7 +1187,6 @@ namespaces.
 Summary: Libraries, includes, etc. to compile with the libvirt library
 Group: Development/Libraries
 Requires: %{name}-client = %{version}-%{release}
-Requires: %{name}-docs = %{version}-%{release}
 Requires: pkgconfig
 
 %description devel
@@ -1204,17 +1211,45 @@ Includes the Sanlock lock manager plugin for the QEMU
 driver
 %endif
 
+
 %prep
 %setup -q
 
-# 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
+# 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
 
 %build
 %if ! %{with_xen}
@@ -1269,8 +1304,8 @@ driver
     %define _without_vmware --without-vmware
 %endif
 
-%if ! %{with_parallels}
-    %define _without_parallels --without-parallels
+%if ! %{with_vz}
+    %define _without_vz --without-vz
 %endif
 
 %if ! %{with_polkit}
@@ -1429,6 +1464,18 @@ driver
     %endif
 %endif
 
+%if 0%{?fedora}
+    # Nightly firmware repo x86/OVMF
+    LOADERS="/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd"
+    # Nightly firmware repo aarch64/AAVMF
+    LOADERS="$LOADERS:/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2.git/aarch64/vars-template-pflash.raw"
+    # Fedora official x86/OVMF
+    LOADERS="$LOADERS:/usr/share/edk2/ovmf/OVMF_CODE.fd:/usr/share/edk2/ovmf/OVMF_VARS.fd"
+    # Fedora official aarch64/AAVMF
+    LOADERS="$LOADERS:/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2/aarch64/vars-template-pflash.raw"
+    %define with_loader_nvram --with-loader-nvram="$LOADERS"
+%endif
+
 # place macros above and build commands below this comment
 
 %if 0%{?enable_autotools}
@@ -1452,7 +1499,7 @@ rm -f po/stamp-po
            %{?_without_esx} \
            %{?_without_hyperv} \
            %{?_without_vmware} \
-           %{?_without_parallels} \
+           %{?_without_vz} \
            --without-bhyve \
            %{?_without_interface} \
            %{?_without_network} \
@@ -1490,6 +1537,7 @@ 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}
@@ -1520,6 +1568,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.la
 %endif
 
+# Temporarily get rid of not-installed libvirt-admin.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-admin.so
+
 %if %{with_network}
 install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/
 # We don't want to install /etc/libvirt/qemu/networks in the main %files list
@@ -1560,6 +1611,12 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.qemu
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/lxc.conf
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.lxc
 %endif
+%if ! %{with_libxl}
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/libxl.conf
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.libxl
+rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_libxl.aug
+rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
+%endif
 %if ! %{with_uml}
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml
 %endif
@@ -1577,7 +1634,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \
 %endif
 
 %if 0%{?rhel} == 5
-rm -f $RPM_BUILD_ROOT%{_prefix}/lib/sysctl.d/libvirtd.conf
+rm -f $RPM_BUILD_ROOT%{_prefix}/lib/sysctl.d/60-libvirtd.conf
 %endif
 
 %clean
@@ -1634,48 +1691,6 @@ 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
@@ -1790,6 +1805,14 @@ if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ;
          < %{_datadir}/libvirt/networks/default.xml \
          > %{_sysconfdir}/libvirt/qemu/networks/default.xml
     ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
+
+    # Make sure libvirt picks up the new network defininiton
+        %if %{with_systemd}
+    /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 ||:
+        %else
+    /sbin/service libvirtd condrestart > /dev/null 2>&1 || :
+        %endif
+
 fi
     %endif
 
@@ -1887,7 +1910,8 @@ exit 0
 
 %files docs
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog.gz NEWS README TODO libvirt-docs/*
+%doc AUTHORS ChangeLog.gz NEWS README TODO
+%doc libvirt-docs/*
 
 # API docs
 %dir %{_datadir}/gtk-doc/html/libvirt/
@@ -1895,6 +1919,15 @@ exit 0
 %doc %{_datadir}/gtk-doc/html/libvirt/*.html
 %doc %{_datadir}/gtk-doc/html/libvirt/*.png
 %doc %{_datadir}/gtk-doc/html/libvirt/*.css
+%doc examples/hellolibvirt
+%doc examples/object-events
+%doc examples/dominfo
+%doc examples/domsuspend
+%doc examples/dommigrate
+%doc examples/openauth
+%doc examples/xml
+%doc examples/systemtap
+
 
 %if %{with_libvirtd}
 %files daemon
@@ -1917,7 +1950,7 @@ exit 0
 %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
 %config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf
     %if 0%{?fedora} || 0%{?rhel} >= 6
-%config(noreplace) %{_prefix}/lib/sysctl.d/libvirtd.conf
+%config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf
     %endif
 
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
@@ -2015,9 +2048,14 @@ exit 0
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/
         %endif
         %if %{with_libxl}
+%config(noreplace) %{_sysconfdir}/libvirt/libxl.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl
+%config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/
 %ghost %dir %{_localstatedir}/run/libvirt/libxl/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/
+%{_datadir}/augeas/lenses/libvirtd_libxl.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
         %endif
         %if %{with_xen}
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/xen/
@@ -2134,6 +2172,11 @@ exit 0
         %if %{with_libxl}
 %files daemon-driver-libxl
 %defattr(-, root, root)
+%config(noreplace) %{_sysconfdir}/libvirt/libxl.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl
+%config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf
+%{_datadir}/augeas/lenses/libvirtd_libxl.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/
 %ghost %dir %{_localstatedir}/run/libvirt/libxl/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/
@@ -2144,8 +2187,6 @@ 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}
 
@@ -2186,6 +2227,9 @@ exit 0
     %if %{with_qemu}
 %config(noreplace) %{_sysconfdir}/libvirt/qemu-sanlock.conf
     %endif
+    %if %{with_libxl}
+%config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf
+    %endif
 %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/sanlock.so
 %{_datadir}/augeas/lenses/libvirt_sanlock.aug
 %{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
@@ -2211,6 +2255,7 @@ exit 0
 %{_libdir}/libvirt.so.*
 %{_libdir}/libvirt-qemu.so.*
 %{_libdir}/libvirt-lxc.so.*
+%{_libdir}/libvirt-admin.so.*
 
 %if %{with_dtrace}
 %{_datadir}/systemtap/tapset/libvirt_probes*.stp
@@ -2274,6 +2319,17 @@ 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
@@ -2284,56 +2340,121 @@ exit 0
 %{_datadir}/libvirt/api/libvirt-api.xml
 %{_datadir}/libvirt/api/libvirt-qemu-api.xml
 %{_datadir}/libvirt/api/libvirt-lxc-api.xml
-
-%doc docs/*.html docs/html docs/*.gif
+# Needed building python bindings
 %doc docs/libvirt-api.xml
-%doc examples/hellolibvirt
-%doc examples/object-events
-%doc examples/dominfo
-%doc examples/domsuspend
-%doc examples/dommigrate
-%doc examples/openauth
-%doc examples/xml
-%doc examples/systemtap
+
 
 %changelog
-* Fri Jun 05 2015 Cole Robinson <crobinso@redhat.com> - 1.2.9.3-2
-- polkit: Allow password-less access for 'libvirt' group (bz #957300)
+* Mon Jul 18 2016 Cole Robinson <crobinso@redhat.com> - 1.2.18.4-1
+- Rebased to version 1.2.18.4
+- CVE-2016-5008: Setting empty VNC password allows access to unauthorized
+  users (bz #1351516)
 
-* 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 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)
+* Thu Jun 23 2016 Cole Robinson <crobinso@redhat.com> - 1.2.18.3-2
+- Advertise fedora edk2 firmware builds to apps (bz #1335395)
 
-* 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)
+* Wed May 04 2016 Cole Robinson <crobinso@redhat.com> - 1.2.18.3-1
+- Rebased to version 1.2.18.3
+- Start network after config-network RPM install (bz #867546)
 
-* Tue Dec 02 2014 Cole Robinson <crobinso@redhat.com> - 1.2.9.1-2
-- Don't reject aarch64 + uefi
+* Thu Mar 17 2016 Cole Robinson <crobinso@redhat.com> - 1.2.18.2-3
+- Fix lxc /proc/meminfo virtualization (bz #1300781)
+- Fix 'permission denied' errors trying to unlink disk images (bz #1289327)
+- Fix qemu:///session connect race failures (bz #1271183)
+- driver: log missing modules as INFO, not WARN (bz #1274849)
 
-* 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)
+* Wed Jan 20 2016 Cole Robinson <crobinso@redhat.com> - 1.2.18.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.18.2-1
+- Rebased to version 1.2.18.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)
+
+* Tue Oct 06 2015 Cole Robinson <crobinso@redhat.com> - 1.2.18.1-2
+- Fix qemu.conf dynamic_ownership=0 (bz #1266628)
+- Fix some spec file warnings
+
+* Mon Sep 21 2015 Cole Robinson <crobinso@redhat.com> - 1.2.18.1-1
+- Rebased to version 1.2.18.1
+- libvirt reports physical=0 for COW2 volumes on block storage (bz #1253754)
+- Fix URL installs with virt-manager/virt-install (bz #1264573)
+
+* Tue Aug  4 2015 Daniel P. Berrange <berrange@redhat.com> - 1.2.18-1
+- Update to 1.2.18 release
+
+* Wed Jul 29 2015 Richard W.M. Jones <rjones@redhat.com> - 1.2.17-2
+- Fix 'Cannot write data: Broken pipe [code=38 domain=7]' (RHBZ#1247746).
+
+* Tue Jul 14 2015 Cole Robinson <crobinso@redhat.com> - 1.2.17-1
+- numerous improvements and refactoring of the parallels driver
+- hardening of vcpu code
+- hardening of migration code
+- a lot of improvement and bug fixes
+
+* Sun Jul 12 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1.2.16-3
+- Rebuild (aarch64)
+
+* Tue Jun 16 2015 Daniel P. Berrange <berrange@redhat.com> - 1.2.16-2
+- Rebuild for libwsman soname bump
+
+* Mon Jun 01 2015 Daniel P. Berrange <berrange@redhat.com> - 1.2.16-1
+- Update to 1.2.16 release
+
+* Thu May 07 2015 Richard W.M. Jones <rjones@redhat.com> - 1.2.15-2
+- Add Cole Robinson's patch to fix arch selection (bz# 1219198, bz#1219191)
+
+* Mon May 04 2015 Cole Robinson <crobinso@redhat.com> - 1.2.15-1
+- Rebased to version 1.2.15
+
+* Wed Apr 15 2015 Cole Robinson <crobinso@redhat.com> - 1.2.14-2
+- Fix LXC domain startup (bz #1210397)
+- Fix race starting multiple session daemons (bz #1200149)
+- Fix change-media success messages
+- Strip invalid control codes from XML (bz #1066564, bz #1184131)
+
+* Thu Apr 02 2015 Cole Robinson <crobinso@redhat.com> - 1.2.14-1
+- Rebased to version 1.2.14
+
+* Tue Mar 10 2015 Cole Robinson <crobinso@redhat.com> - 1.2.13-2
+- Fix connecting to qemu:///session (bz #1198244)
+
+* 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)
+- ppc64le fixes (bz #1163439)
+
+* Mon Nov  3 2014 Daniel Veillard <veillard@redhat.com> - 1.2.10
+- upstream release
 
 * Thu Oct 30 2014 Cole Robinson <crobinso@redhat.com> - 1.2.9-4
 - Fix creating i686 guest with x86_64 emulator (bz #1153797)

sources

@@ -1 +1 @@
-b3ffa5e11880acca7fa19a3cca2d6280  libvirt-1.2.9.3.tar.gz
+8a027dfdde5fb36059e4d7e069708a56  libvirt-1.2.18.4.tar.gz