Enable ZFS storage driver (bz #1471912)

Don't use cgroup mount points from /proc/mounts that are hidden (bz #1470593)
disk driver name=... should be optional (bz #1473091)

.gitignore

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

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 ||\

0001-Fix-padding-of-encrypted-data.patch

@@ -0,0 +1,55 @@
+From: "Daniel P. Berrange" <berrange@redhat.com>
+Date: Tue, 2 May 2017 11:32:43 +0100
+Subject: [PATCH] Fix padding of encrypted data
+
+If we are encoding a block of data that is 16 bytes in length,
+we cannot leave it as 16 bytes, we must pad it out to the next
+block boundary, 32 bytes. Without this padding, the decoder will
+incorrectly treat the last byte of plain text as the padding
+length, as it can't distinguish padded from non-padded data.
+
+The problem exhibited itself when using a 16 byte passphrase
+for a LUKS volume
+
+  $ virsh secret-set-value 55806c7d-8e93-456f-829b-607d8c198367 \
+       $(echo -n 1234567812345678 | base64)
+  Secret value set
+
+  $ virsh start demo
+  error: Failed to start domain demo
+  error: internal error: process exited while connecting to monitor: >>>>>>>>>>Len 16
+  2017-05-02T10:35:40.016390Z qemu-system-x86_64: -object \
+    secret,id=virtio-disk1-luks-secret0,data=SEtNi5vDUeyseMKHwc1c1Q==,\
+    keyid=masterKey0,iv=zm7apUB1A6dPcH53VW960Q==,format=base64: \
+    Incorrect number of padding bytes (56) found on decrypted data
+
+Notice how the padding '56' corresponds to the ordinal value of
+the character '8'.
+
+Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
+(cherry picked from commit 71890992daf37ec78b00b4ce873369421dc99731)
+---
+ src/util/vircrypto.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c
+index 03410a1a4..8f1e0b7b7 100644
+--- a/src/util/vircrypto.c
++++ b/src/util/vircrypto.c
+@@ -152,8 +152,14 @@ virCryptoEncryptDataAESgnutls(gnutls_cipher_algorithm_t gnutls_enc_alg,
+     uint8_t *ciphertext;
+     size_t ciphertextlen;
+ 
+-    /* Allocate a padded buffer, copy in the data */
+-    ciphertextlen = VIR_ROUND_UP(datalen, 16);
++    /* Allocate a padded buffer, copy in the data.
++     *
++     * NB, we must *always* have at least 1 byte of
++     * padding - we can't skip it on multiples of
++     * 16, otherwise decoder can't distinguish padded
++     * data from non-padded data. Hence datalen + 1
++     */
++    ciphertextlen = VIR_ROUND_UP(datalen + 1, 16);
+     if (VIR_ALLOC_N(ciphertext, ciphertextlen) < 0)
+         return -1;
+     memcpy(ciphertext, data, datalen);

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;

0002-spec-Add-support-for-building-the-zfs-storage-driver.patch

@@ -0,0 +1,90 @@
+From: Neal Gompa <ngompa13@gmail.com>
+Date: Mon, 17 Jul 2017 11:32:46 -0400
+Subject: [PATCH] spec: Add support for building the zfs storage driver
+
+Where it can be supported in Fedora, the driver is built and made
+available as a subpackage.
+
+Signed-off-by: Neal Gompa <ngompa13@gmail.com>
+(cherry picked from commit 9af764e86aef7dfb0191a9561bf1d1abf941da05)
+---
+ libvirt.spec.in | 31 +++++++++++++++++++++++++++++++
+ 1 file changed, 31 insertions(+)
+
+diff --git a/libvirt.spec.in b/libvirt.spec.in
+index 8eb67fa2e..f9a705e7c 100644
+--- a/libvirt.spec.in
++++ b/libvirt.spec.in
+@@ -70,6 +70,13 @@
+ %define with_storage_gluster 0%{!?_without_storage_gluster:1}
+ %define with_numactl          0%{!?_without_numactl:1}
+ 
++# F25+ has zfs-fuse
++%if 0%{?fedora} >= 25
++    %define with_storage_zfs      0%{!?_without_storage_zfs:1}
++%else
++    %define with_storage_zfs      0
++%endif
++
+ # A few optional bits off by default, we enable later
+ %define with_fuse          0%{!?_without_fuse:0}
+ %define with_cgconfig      0%{!?_without_cgconfig:0}
+@@ -113,6 +120,12 @@
+     %endif
+ %endif
+ 
++# zfs-fuse is not available on some architectures
++%ifarch s390 s390x aarch64
++    %define with_storage_zfs 0
++%endif
++
++
+ # RHEL doesn't ship OpenVZ, VBox, UML, PowerHypervisor,
+ # VMware, libxenserver (xenapi), libxenlight (Xen 4.1 and newer),
+ # or HyperV.
+@@ -364,6 +377,12 @@ BuildRequires: glusterfs-devel >= 3.4.1
+ %if %{with_storage_sheepdog}
+ BuildRequires: sheepdog
+ %endif
++%if %{with_storage_zfs}
++# Support any conforming implementation of zfs. On stock Fedora
++# this is zfs-fuse, but could be zfsonlinux upstream RPMs
++BuildRequires: /sbin/zfs
++BuildRequires: /sbin/zpool
++%endif
+ %if %{with_numactl}
+ # For QEMU/LXC numa info
+ BuildRequires: numactl-devel
+@@ -597,6 +616,11 @@ Requires: device-mapper
+ # For Sheepdog support
+ Requires: sheepdog
+ %endif
++%if %{with_storage_zfs}
++# Support any conforming implementation of zfs
++Requires: /sbin/zfs
++Requires: /sbin/zpool
++%endif
+ %if %{with_qemu}
+ # From QEMU RPMs
+ Requires: /usr/bin/qemu-img
+@@ -1063,6 +1087,12 @@ rm -rf .git
+     %define arg_storage_gluster --without-storage-gluster
+ %endif
+ 
++%if %{with_storage_zfs}
++    %define arg_storage_zfs --with-storage-zfs
++%else
++    %define arg_storage_zfs --without-storage-zfs
++%endif
++
+ %if %{with_numactl}
+     %define arg_numactl --with-numactl
+ %else
+@@ -1170,6 +1200,7 @@ rm -f po/stamp-po
+            %{?arg_storage_rbd} \
+            %{?arg_storage_sheepdog} \
+            %{?arg_storage_gluster} \
++           %{?arg_storage_zfs} \
+            %{?arg_numactl} \
+            %{?arg_numad} \
+            --with-capng \

0003-Avoid-hidden-cgroup-mount-points.patch

@@ -0,0 +1,150 @@
+From: Juan Hernandez <jhernand@redhat.com>
+Date: Thu, 6 Jul 2017 17:03:31 +0200
+Subject: [PATCH] Avoid hidden cgroup mount points
+
+Currently the scan of the /proc/mounts file used to find cgroup mount
+points doesn't take into account that mount points may hidden by other
+mount points. For, example in certain Kubernetes environments the
+/proc/mounts contains the following lines:
+
+  cgroup /sys/fs/cgroup/net_prio,net_cls cgroup ...
+  tmpfs /sys/fs/cgroup tmpfs ...
+  cgroup /sys/fs/cgroup/net_cls,net_prio cgroup ...
+
+In this particular environment the first mount point is hidden by the
+second one. The correct mount point is the third one, but libvirt will
+never process it because it only checks the first mount point for each
+controller (net_cls in this case). So libvirt will try to use the first
+mount point, which doesn't actually exist, and the complete detection
+process will fail.
+
+To avoid that issue this patch changes the virCgroupDetectMountsFromFile
+function so that when there are duplicates it takes the information from
+the last line in /proc/mounts. This requires removing the previous
+explicit condition to skip duplicates, and adding code to free the
+memory used by the processing of duplicated lines.
+
+Related-To: https://bugzilla.redhat.com/1468214
+Related-To: https://github.com/kubevirt/libvirt/issues/4
+Signed-off-by: Juan Hernandez <jhernand@redhat.com>
+(cherry picked from commit dacd160d7479e0ec2d8a63f102145fd30636a1c8)
+---
+ src/util/vircgroup.c                | 23 ++++++++++++++---------
+ tests/vircgroupdata/kubevirt.mounts | 25 +++++++++++++++++++++++++
+ tests/vircgroupdata/kubevirt.parsed | 10 ++++++++++
+ tests/vircgrouptest.c               |  1 +
+ 4 files changed, 50 insertions(+), 9 deletions(-)
+ create mode 100644 tests/vircgroupdata/kubevirt.mounts
+ create mode 100644 tests/vircgroupdata/kubevirt.parsed
+
+diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
+index f2477d5e9..322f7fb54 100644
+--- a/src/util/vircgroup.c
++++ b/src/util/vircgroup.c
+@@ -396,6 +396,7 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
+             const char *typestr = virCgroupControllerTypeToString(i);
+             int typelen = strlen(typestr);
+             char *tmp = entry.mnt_opts;
++            struct virCgroupController *controller = &group->controllers[i];
+             while (tmp) {
+                 char *next = strchr(tmp, ',');
+                 int len;
+@@ -405,18 +406,22 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
+                 } else {
+                     len = strlen(tmp);
+                 }
+-                /* NB, the same controller can appear >1 time in mount list
+-                 * due to bind mounts from one location to another. Pick the
+-                 * first entry only
+-                 */
+-                if (typelen == len && STREQLEN(typestr, tmp, len) &&
+-                    !group->controllers[i].mountPoint) {
++
++                if (typelen == len && STREQLEN(typestr, tmp, len)) {
+                     char *linksrc;
+                     struct stat sb;
+                     char *tmp2;
+ 
+-                    if (VIR_STRDUP(group->controllers[i].mountPoint,
+-                                   entry.mnt_dir) < 0)
++                    /* Note that the lines in /proc/mounts have the same
++                     * order than the mount operations, and that there may
++                     * be duplicates due to bind mounts. This means
++                     * that the same mount point may be processed more than
++                     * once. We need to save the results of the last one,
++                     * and we need to be careful to release the memory used
++                     * by previous processing. */
++                    VIR_FREE(controller->mountPoint);
++                    VIR_FREE(controller->linkPoint);
++                    if (VIR_STRDUP(controller->mountPoint, entry.mnt_dir) < 0)
+                         goto error;
+ 
+                     tmp2 = strrchr(entry.mnt_dir, '/');
+@@ -452,7 +457,7 @@ virCgroupDetectMountsFromFile(virCgroupPtr group,
+                                 VIR_WARN("Expecting a symlink at %s for controller %s",
+                                          linksrc, typestr);
+                             } else {
+-                                group->controllers[i].linkPoint = linksrc;
++                                controller->linkPoint = linksrc;
+                             }
+                         }
+                     }
+diff --git a/tests/vircgroupdata/kubevirt.mounts b/tests/vircgroupdata/kubevirt.mounts
+new file mode 100644
+index 000000000..ca036196b
+--- /dev/null
++++ b/tests/vircgroupdata/kubevirt.mounts
+@@ -0,0 +1,25 @@
++rootfs / rootfs rw 0 0
++proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0
++udev /dev devtmpfs rw,nosuid,relatime,size=10240k,nr_inodes=1006404,mode=755 0 0
++devpts /dev/pts devpts rw,relatime,gid=5,mode=620,ptmxmode=000 0 0
++sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0
++/dev/sda1 / ext4 rw,noatime,data=ordered 0 0
++tmpfs /run tmpfs rw,nodev,relatime,size=812296k,mode=755 0 0
++mqueue /dev/mqueue mqueue rw,nosuid,nodev,noexec,relatime 0 0
++shm /dev/shm tmpfs rw,nosuid,nodev,noexec,relatime 0 0
++debugfs /sys/kernel/debug debugfs rw,nosuid,nodev,noexec,relatime 0 0
++cgroup_root /sys/fs/cgroup tmpfs rw,nosuid,nodev,noexec,relatime,size=10240k,mode=755 0 0
++openrc /sys/fs/cgroup/openrc cgroup rw,nosuid,nodev,noexec,relatime,release_agent=/lib64/rc/sh/cgroup-release-agent.sh,name=openrc 0 0
++cpuset /some/random/location/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0
++cpuset /sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0
++cpu /sys/fs/cgroup/cpu cgroup rw,nosuid,nodev,noexec,relatime,cpu 0 0
++cpuacct /some/random/location/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuacct 0 0
++cpuacct /sys/fs/cgroup/cpuacct cgroup rw,nosuid,nodev,noexec,relatime,cpuacct 0 0
++memory /sys/fs/cgroup/memory cgroup rw,nosuid,nodev,noexec,relatime,memory 0 0
++devices /sys/fs/cgroup/devices cgroup rw,nosuid,nodev,noexec,relatime,devices 0 0
++freezer /sys/fs/cgroup/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0
++blkio /sys/fs/cgroup/blkio cgroup rw,nosuid,nodev,noexec,relatime,blkio 0 0
++perf_event /sys/fs/cgroup/perf_event cgroup rw,nosuid,nodev,noexec,relatime,perf_event 0 0
++hugetlb /sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 0
++binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc rw,nosuid,nodev,noexec,relatime 0 0
++freezer /some/random/location/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0
+diff --git a/tests/vircgroupdata/kubevirt.parsed b/tests/vircgroupdata/kubevirt.parsed
+new file mode 100644
+index 000000000..694870723
+--- /dev/null
++++ b/tests/vircgroupdata/kubevirt.parsed
+@@ -0,0 +1,10 @@
++cpu          /sys/fs/cgroup/cpu
++cpuacct      /sys/fs/cgroup/cpuacct
++cpuset       /sys/fs/cgroup/cpuset
++memory       /sys/fs/cgroup/memory
++devices      /sys/fs/cgroup/devices
++freezer      /some/random/location/freezer
++blkio        /sys/fs/cgroup/blkio
++net_cls      <null>
++perf_event   /sys/fs/cgroup/perf_event
++name=systemd <null>
+diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
+index f55ef74a1..cf0315f16 100644
+--- a/tests/vircgrouptest.c
++++ b/tests/vircgrouptest.c
+@@ -885,6 +885,7 @@ mymain(void)
+     DETECT_MOUNTS("cgroups3");
+     DETECT_MOUNTS("all-in-one");
+     DETECT_MOUNTS("no-cgroups");
++    DETECT_MOUNTS("kubevirt");
+ 
+     if (virTestRun("New cgroup for self", testCgroupNewForSelf, NULL) < 0)
+         ret = -1;

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

0004-docs-schema-make-disk-driver-name-attribute-optional.patch

@@ -0,0 +1,53 @@
+From: Jim Fehlig <jfehlig@suse.com>
+Date: Tue, 18 Jul 2017 10:20:35 -0600
+Subject: [PATCH] docs: schema: make disk driver name attribute optional
+
+/domain/devices/disk/driver/@name is not a required or mandatory
+attribute according to formatdomain, and indeed it was agreed on
+IRC that the attribute is "optional for input, recommended (but
+not required) for output". Currently the schema requires the
+attribute, causing virt-xml-validate to fail on disk config where
+the driver name is not explicitly specified. E.g.
+
+# cat test.xml | grep -A 5 cdrom
+    <disk type='file' device='cdrom'>
+      <driver type='raw'/>
+      <target dev='hdb' bus='ide'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
+    </disk>
+
+# virt-xml-validate test.xml
+Relax-NG validity error : Extra element devices in interleave
+test.xml:21: element devices: Relax-NG validity error : Element domain failed to validate content
+test.xml fails to validate
+
+Relaxing the name attribute to be optional fixes the validation
+
+# virt-xml-validate test.xml
+test.xml validates
+
+(cherry picked from commit b494e09d058f09b48d0fd8855edd557101294671)
+---
+ docs/schemas/domaincommon.rng | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
+index 9a7d03ed9..38dda780e 100644
+--- a/docs/schemas/domaincommon.rng
++++ b/docs/schemas/domaincommon.rng
+@@ -1670,9 +1670,11 @@
+     </element>
+   </define>
+   <define name="driverFormat">
+-    <attribute name="name">
+-      <ref name="genericName"/>
+-    </attribute>
++    <optional>
++      <attribute name="name">
++        <ref name="genericName"/>
++      </attribute>
++    </optional>
+     <optional>
+       <attribute name='type'>
+         <choice>

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

sources

@@ -1 +1 @@
-b3ffa5e11880acca7fa19a3cca2d6280  libvirt-1.2.9.3.tar.gz
+SHA512 (libvirt-2.2.1.tar.xz) = b89a2665bea81c440afc3f9f69c26e314344f1f2fbf53f82b25bdddcc89532ddf3393902e9cf552edb827ce5d8b46b9214b5a25303b19cf0f3f085131d870518