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-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);

0001-qemu_hotplug-Allow-QoS-update-in-qemuDomainChangeNet.patch

@@ -1,66 +0,0 @@
-From d519f225d79a61451cfa62b463ea3083e9367353 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 1 Oct 2013 15:04:48 +0200
-Subject: [PATCH] qemu_hotplug: Allow QoS update in qemuDomainChangeNet
-
-The qemuDomainChangeNet() is called when 'virsh update-device' is
-invoked on a NIC. Currently, we fail to update the QoS even though
-we have routines for that.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 9fa10d3901a14997f724fe50ad8a33d7f0d23abe)
----
- src/qemu/qemu_hotplug.c | 19 +++++++++++++++++--
- 1 file changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index f06930e..818c726 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -1799,6 +1799,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
-     bool needFilterChange = false;
-     bool needLinkStateChange = false;
-     bool needReplaceDevDef = false;
-+    bool needBandwidthSet = false;
-     int ret = -1;
- 
-     if (!devslot || !(olddev = *devslot)) {
-@@ -2062,8 +2063,6 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
-         virDomainNetGetActualDirectMode(olddev) != virDomainNetGetActualDirectMode(olddev) ||
-         !virNetDevVPortProfileEqual(virDomainNetGetActualVirtPortProfile(olddev),
-                                     virDomainNetGetActualVirtPortProfile(newdev)) ||
--        !virNetDevBandwidthEqual(virDomainNetGetActualBandwidth(olddev),
--                                 virDomainNetGetActualBandwidth(newdev)) ||
-         !virNetDevVlanEqual(virDomainNetGetActualVlan(olddev),
-                             virDomainNetGetActualVlan(newdev))) {
-         needReconnect = true;
-@@ -2072,6 +2071,10 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
-     if (olddev->linkstate != newdev->linkstate)
-         needLinkStateChange = true;
- 
-+    if (!virNetDevBandwidthEqual(virDomainNetGetActualBandwidth(olddev),
-+                                 virDomainNetGetActualBandwidth(newdev)))
-+        needBandwidthSet = true;
-+
-     /* FINALLY - actually perform the required actions */
- 
-     if (needReconnect) {
-@@ -2081,6 +2084,18 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
-         goto cleanup;
-     }
- 
-+    if (needBandwidthSet) {
-+        if (virNetDevBandwidthSet(newdev->ifname,
-+                                  virDomainNetGetActualBandwidth(newdev),
-+                                  false) < 0) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("cannot set bandwidth limits on %s"),
-+                           newdev->ifname);
-+            goto cleanup;
-+        }
-+        needReplaceDevDef = true;
-+    }
-+
-     if (needBridgeChange) {
-         if (qemuDomainChangeNetBridge(dom->conn, vm, olddev, newdev) < 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 \

0002-virNetDevBandwidthEqual-Make-it-more-robust.patch

@@ -1,57 +0,0 @@
-From 658f4b3c39c9bdd490a44175742f8259dd10b84f Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 2 Oct 2013 09:18:02 +0200
-Subject: [PATCH] virNetDevBandwidthEqual: Make it more robust
-
-So far the virNetDevBandwidthEqual() expected both ->in and ->out items
-to be allocated for both @a and @b compared. This is not necessary true
-for all our code. For instance, running 'update-device' twice over a NIC
-with the very same XML results in SIGSEGV-ing in this function.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit ee02fbc8e4a24c1347761ceff2ddb2c108e9611c)
----
- src/util/virnetdevbandwidth.c | 26 ++++++++++++++++++++------
- 1 file changed, 20 insertions(+), 6 deletions(-)
-
-diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c
-index 42b0a50..17f4fa3 100644
---- a/src/util/virnetdevbandwidth.c
-+++ b/src/util/virnetdevbandwidth.c
-@@ -335,16 +335,30 @@ virNetDevBandwidthEqual(virNetDevBandwidthPtr a,
-         return false;
- 
-     /* in */
--    if (a->in->average != b->in->average ||
--        a->in->peak != b->in->peak ||
--        a->in->burst != b->in->burst)
-+    if (a->in) {
-+        if (!b->in)
-+            return false;
-+
-+        if (a->in->average != b->in->average ||
-+            a->in->peak != b->in->peak ||
-+            a->in->burst != b->in->burst)
-+            return false;
-+    } else if (b->in) {
-         return false;
-+    }
- 
-     /*out*/
--    if (a->out->average != b->out->average ||
--        a->out->peak != b->out->peak ||
--        a->out->burst != b->out->burst)
-+    if (a->out) {
-+        if (!b->out)
-+            return false;
-+
-+        if (a->out->average != b->out->average ||
-+            a->out->peak != b->out->peak ||
-+            a->out->burst != b->out->burst)
-+            return false;
-+    } else if (b->out) {
-         return false;
-+    }
- 
-     return true;
- }

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-Remove-virConnectPtr-arg-from-virNWFilterDefParse.patch

@@ -1,105 +0,0 @@
-From 56c170544f7a71749ef63fef650c71787c05e8af Mon Sep 17 00:00:00 2001
-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Thu, 3 Oct 2013 14:06:58 +0100
-Subject: [PATCH] Remove virConnectPtr arg from virNWFilterDefParse*
-
-None of the virNWFilterDefParse* methods require a virConnectPtr
-arg, so just drop it
-
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
----
- src/conf/nwfilter_conf.c       | 15 ++++++---------
- src/conf/nwfilter_conf.h       |  6 ++----
- src/nwfilter/nwfilter_driver.c |  2 +-
- tests/nwfilterxml2xmltest.c    |  2 +-
- 4 files changed, 10 insertions(+), 15 deletions(-)
-
-diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
-index 3456b77..c009921 100644
---- a/src/conf/nwfilter_conf.c
-+++ b/src/conf/nwfilter_conf.c
-@@ -2634,8 +2634,7 @@ cleanup:
- 
- 
- static virNWFilterDefPtr
--virNWFilterDefParse(virConnectPtr conn ATTRIBUTE_UNUSED,
--                    const char *xmlStr,
-+virNWFilterDefParse(const char *xmlStr,
-                     const char *filename) {
-     virNWFilterDefPtr def = NULL;
-     xmlDocPtr xml;
-@@ -2650,18 +2649,16 @@ virNWFilterDefParse(virConnectPtr conn ATTRIBUTE_UNUSED,
- 
- 
- virNWFilterDefPtr
--virNWFilterDefParseString(virConnectPtr conn,
--                          const char *xmlStr)
-+virNWFilterDefParseString(const char *xmlStr)
- {
--    return virNWFilterDefParse(conn, xmlStr, NULL);
-+    return virNWFilterDefParse(xmlStr, NULL);
- }
- 
- 
- virNWFilterDefPtr
--virNWFilterDefParseFile(virConnectPtr conn,
--                        const char *filename)
-+virNWFilterDefParseFile(const char *filename)
- {
--    return virNWFilterDefParse(conn, NULL, filename);
-+    return virNWFilterDefParse(NULL, filename);
- }
- 
- 
-@@ -3056,7 +3053,7 @@ virNWFilterObjLoad(virConnectPtr conn,
-     virNWFilterDefPtr def;
-     virNWFilterObjPtr nwfilter;
- 
--    if (!(def = virNWFilterDefParseFile(conn, path))) {
-+    if (!(def = virNWFilterDefParseFile(path))) {
-         return NULL;
-     }
- 
-diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h
-index 5d04cff..faa7527 100644
---- a/src/conf/nwfilter_conf.h
-+++ b/src/conf/nwfilter_conf.h
-@@ -713,10 +713,8 @@ int virNWFilterLoadAllConfigs(virConnectPtr conn,
- char *virNWFilterConfigFile(const char *dir,
-                             const char *name);
- 
--virNWFilterDefPtr virNWFilterDefParseString(virConnectPtr conn,
--                                            const char *xml);
--virNWFilterDefPtr virNWFilterDefParseFile(virConnectPtr conn,
--                                          const char *filename);
-+virNWFilterDefPtr virNWFilterDefParseString(const char *xml);
-+virNWFilterDefPtr virNWFilterDefParseFile(const char *filename);
- 
- void virNWFilterObjLock(virNWFilterObjPtr obj);
- void virNWFilterObjUnlock(virNWFilterObjPtr obj);
-diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
-index 1ed28a2..c2afdfc 100644
---- a/src/nwfilter/nwfilter_driver.c
-+++ b/src/nwfilter/nwfilter_driver.c
-@@ -566,7 +566,7 @@ nwfilterDefineXML(virConnectPtr conn,
-     nwfilterDriverLock(driver);
-     virNWFilterCallbackDriversLock();
- 
--    if (!(def = virNWFilterDefParseString(conn, xml)))
-+    if (!(def = virNWFilterDefParseString(xml)))
-         goto cleanup;
- 
-     if (virNWFilterDefineXMLEnsureACL(conn, def) < 0)
-diff --git a/tests/nwfilterxml2xmltest.c b/tests/nwfilterxml2xmltest.c
-index 84e61da..14191a6 100644
---- a/tests/nwfilterxml2xmltest.c
-+++ b/tests/nwfilterxml2xmltest.c
-@@ -36,7 +36,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *outxml,
- 
-     virResetLastError();
- 
--    if (!(dev = virNWFilterDefParseString(NULL, inXmlData))) {
-+    if (!(dev = virNWFilterDefParseString(inXmlData))) {
-         if (expect_error) {
-             virResetLastError();
-             goto done;

0004-Don-t-pass-virConnectPtr-in-nwfilter-struct-domUpdat.patch

@@ -1,355 +0,0 @@
-From 0a5abfb22d5d030cc3780c44b805b5b92567b44a Mon Sep 17 00:00:00 2001
-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Thu, 3 Oct 2013 14:06:59 +0100
-Subject: [PATCH] Don't pass virConnectPtr in nwfilter 'struct
- domUpdateCBStruct'
-
-The nwfilter driver only needs a reference to its private
-state object, not a full virConnectPtr. Update the domUpdateCBStruct
-struct to have a 'void *opaque' field instead of a virConnectPtr.
-
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
----
- src/conf/nwfilter_conf.c               | 14 +++++++++++---
- src/conf/nwfilter_conf.h               |  4 ++--
- src/nwfilter/nwfilter_dhcpsnoop.c      | 12 ++++++------
- src/nwfilter/nwfilter_driver.c         |  5 +++--
- src/nwfilter/nwfilter_gentech_driver.c | 32 ++++++++++++++++----------------
- src/nwfilter/nwfilter_gentech_driver.h | 10 +++++-----
- src/nwfilter/nwfilter_learnipaddr.c    |  6 +++---
- 7 files changed, 46 insertions(+), 37 deletions(-)
-
-diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
-index c009921..9927f7e 100644
---- a/src/conf/nwfilter_conf.c
-+++ b/src/conf/nwfilter_conf.c
-@@ -2850,6 +2850,7 @@ virNWFilterCallbackDriversUnlock(void)
- 
- 
- static virDomainObjListIterator virNWFilterDomainFWUpdateCB;
-+static void *virNWFilterDomainFWUpdateOpaque;
- 
- /**
-  * virNWFilterInstFiltersOnAllVMs:
-@@ -2861,7 +2862,7 @@ virNWFilterInstFiltersOnAllVMs(virConnectPtr conn)
- {
-     size_t i;
-     struct domUpdateCBStruct cb = {
--        .conn = conn,
-+        .opaque = virNWFilterDomainFWUpdateOpaque,
-         .step = STEP_APPLY_CURRENT,
-         .skipInterfaces = NULL, /* not needed */
-     };
-@@ -2880,7 +2881,7 @@ virNWFilterTriggerVMFilterRebuild(virConnectPtr conn)
-     size_t i;
-     int ret = 0;
-     struct domUpdateCBStruct cb = {
--        .conn = conn,
-+        .opaque = virNWFilterDomainFWUpdateOpaque,
-         .step = STEP_APPLY_NEW,
-         .skipInterfaces = virHashCreate(0, NULL),
-     };
-@@ -3474,9 +3475,14 @@ char *virNWFilterConfigFile(const char *dir,
- }
- 
- 
--int virNWFilterConfLayerInit(virDomainObjListIterator domUpdateCB)
-+int virNWFilterConfLayerInit(virDomainObjListIterator domUpdateCB,
-+                             void *opaque)
- {
-+    if (initialized)
-+        return -1;
-+
-     virNWFilterDomainFWUpdateCB = domUpdateCB;
-+    virNWFilterDomainFWUpdateOpaque = opaque;
- 
-     initialized = true;
- 
-@@ -3495,6 +3501,8 @@ void virNWFilterConfLayerShutdown(void)
-     virMutexDestroy(&updateMutex);
- 
-     initialized = false;
-+    virNWFilterDomainFWUpdateOpaque = NULL;
-+    virNWFilterDomainFWUpdateCB = NULL;
- }
- 
- 
-diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h
-index faa7527..e470615 100644
---- a/src/conf/nwfilter_conf.h
-+++ b/src/conf/nwfilter_conf.h
-@@ -586,7 +586,7 @@ enum UpdateStep {
- };
- 
- struct domUpdateCBStruct {
--    virConnectPtr conn;
-+    void *opaque;
-     enum UpdateStep step;
-     virHashTablePtr skipInterfaces;
- };
-@@ -722,7 +722,7 @@ void virNWFilterObjUnlock(virNWFilterObjPtr obj);
- void virNWFilterLockFilterUpdates(void);
- void virNWFilterUnlockFilterUpdates(void);
- 
--int virNWFilterConfLayerInit(virDomainObjListIterator domUpdateCB);
-+int virNWFilterConfLayerInit(virDomainObjListIterator domUpdateCB, void *opaque);
- void virNWFilterConfLayerShutdown(void);
- 
- int virNWFilterInstFiltersOnAllVMs(virConnectPtr conn);
-diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
-index 3e9f046..2bc1686 100644
---- a/src/nwfilter/nwfilter_dhcpsnoop.c
-+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
-@@ -481,15 +481,15 @@ virNWFilterSnoopIPLeaseInstallRule(virNWFilterSnoopIPLeasePtr ipl,
-     /* instantiate the filters */
- 
-     if (req->ifname)
--        rc = virNWFilterInstantiateFilterLate(NULL,
-+        rc = virNWFilterInstantiateFilterLate(req->driver,
-+                                              NULL,
-                                               req->ifname,
-                                               req->ifindex,
-                                               req->linkdev,
-                                               req->nettype,
-                                               &req->macaddr,
-                                               req->filtername,
--                                              req->vars,
--                                              req->driver);
-+                                              req->vars);
- 
- exit_snooprequnlock:
-     virNWFilterSnoopReqUnlock(req);
-@@ -867,15 +867,15 @@ virNWFilterSnoopReqLeaseDel(virNWFilterSnoopReqPtr req,
-         goto skip_instantiate;
- 
-     if (ipAddrLeft) {
--        ret = virNWFilterInstantiateFilterLate(NULL,
-+        ret = virNWFilterInstantiateFilterLate(req->driver,
-+                                               NULL,
-                                                req->ifname,
-                                                req->ifindex,
-                                                req->linkdev,
-                                                req->nettype,
-                                                &req->macaddr,
-                                                req->filtername,
--                                               req->vars,
--                                               req->driver);
-+                                               req->vars);
-     } else {
-         const virNWFilterVarValuePtr dhcpsrvrs =
-             virHashLookup(req->vars->hashTable, NWFILTER_VARNAME_DHCPSERVER);
-diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
-index c2afdfc..6e20e03 100644
---- a/src/nwfilter/nwfilter_driver.c
-+++ b/src/nwfilter/nwfilter_driver.c
-@@ -203,7 +203,8 @@ nwfilterStateInitialize(bool privileged,
- 
-     virNWFilterTechDriversInit(privileged);
- 
--    if (virNWFilterConfLayerInit(virNWFilterDomainFWUpdateCB) < 0)
-+    if (virNWFilterConfLayerInit(virNWFilterDomainFWUpdateCB,
-+                                 driverState) < 0)
-         goto err_techdrivers_shutdown;
- 
-     /*
-@@ -681,7 +682,7 @@ nwfilterInstantiateFilter(virConnectPtr conn,
-                           const unsigned char *vmuuid,
-                           virDomainNetDefPtr net)
- {
--    return virNWFilterInstantiateFilter(conn, vmuuid, net);
-+    return virNWFilterInstantiateFilter(conn->nwfilterPrivateData, vmuuid, net);
- }
- 
- 
-diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c
-index 382d73f..5961165 100644
---- a/src/nwfilter/nwfilter_gentech_driver.c
-+++ b/src/nwfilter/nwfilter_gentech_driver.c
-@@ -800,7 +800,8 @@ err_unresolvable_vars:
-  * Call this function while holding the NWFilter filter update lock
-  */
- static int
--__virNWFilterInstantiateFilter(const unsigned char *vmuuid,
-+__virNWFilterInstantiateFilter(virNWFilterDriverStatePtr driver,
-+                               const unsigned char *vmuuid,
-                                bool teardownOld,
-                                const char *ifname,
-                                int ifindex,
-@@ -810,7 +811,6 @@ __virNWFilterInstantiateFilter(const unsigned char *vmuuid,
-                                const char *filtername,
-                                virNWFilterHashTablePtr filterparams,
-                                enum instCase useNewFilter,
--                               virNWFilterDriverStatePtr driver,
-                                bool forceWithPendingReq,
-                                bool *foundNewFilter)
- {
-@@ -921,7 +921,7 @@ err_exit:
- 
- 
- static int
--_virNWFilterInstantiateFilter(virConnectPtr conn,
-+_virNWFilterInstantiateFilter(virNWFilterDriverStatePtr driver,
-                               const unsigned char *vmuuid,
-                               const virDomainNetDefPtr net,
-                               bool teardownOld,
-@@ -948,7 +948,8 @@ _virNWFilterInstantiateFilter(virConnectPtr conn,
-         goto cleanup;
-     }
- 
--    rc = __virNWFilterInstantiateFilter(vmuuid,
-+    rc = __virNWFilterInstantiateFilter(driver,
-+                                        vmuuid,
-                                         teardownOld,
-                                         net->ifname,
-                                         ifindex,
-@@ -958,7 +959,6 @@ _virNWFilterInstantiateFilter(virConnectPtr conn,
-                                         net->filter,
-                                         net->filterparams,
-                                         useNewFilter,
--                                        conn->nwfilterPrivateData,
-                                         false,
-                                         foundNewFilter);
- 
-@@ -970,22 +970,23 @@ cleanup:
- 
- 
- int
--virNWFilterInstantiateFilterLate(const unsigned char *vmuuid,
-+virNWFilterInstantiateFilterLate(virNWFilterDriverStatePtr driver,
-+                                 const unsigned char *vmuuid,
-                                  const char *ifname,
-                                  int ifindex,
-                                  const char *linkdev,
-                                  enum virDomainNetType nettype,
-                                  const virMacAddrPtr macaddr,
-                                  const char *filtername,
--                                 virNWFilterHashTablePtr filterparams,
--                                 virNWFilterDriverStatePtr driver)
-+                                 virNWFilterHashTablePtr filterparams)
- {
-     int rc;
-     bool foundNewFilter = false;
- 
-     virNWFilterLockFilterUpdates();
- 
--    rc = __virNWFilterInstantiateFilter(vmuuid,
-+    rc = __virNWFilterInstantiateFilter(driver,
-+                                        vmuuid,
-                                         true,
-                                         ifname,
-                                         ifindex,
-@@ -995,7 +996,6 @@ virNWFilterInstantiateFilterLate(const unsigned char *vmuuid,
-                                         filtername,
-                                         filterparams,
-                                         INSTANTIATE_ALWAYS,
--                                        driver,
-                                         true,
-                                         &foundNewFilter);
-     if (rc < 0) {
-@@ -1015,13 +1015,13 @@ virNWFilterInstantiateFilterLate(const unsigned char *vmuuid,
- 
- 
- int
--virNWFilterInstantiateFilter(virConnectPtr conn,
-+virNWFilterInstantiateFilter(virNWFilterDriverStatePtr driver,
-                              const unsigned char *vmuuid,
-                              const virDomainNetDefPtr net)
- {
-     bool foundNewFilter = false;
- 
--    return _virNWFilterInstantiateFilter(conn, vmuuid, net,
-+    return _virNWFilterInstantiateFilter(driver, vmuuid, net,
-                                          1,
-                                          INSTANTIATE_ALWAYS,
-                                          &foundNewFilter);
-@@ -1029,14 +1029,14 @@ virNWFilterInstantiateFilter(virConnectPtr conn,
- 
- 
- int
--virNWFilterUpdateInstantiateFilter(virConnectPtr conn,
-+virNWFilterUpdateInstantiateFilter(virNWFilterDriverStatePtr driver,
-                                    const unsigned char *vmuuid,
-                                    const virDomainNetDefPtr net,
-                                    bool *skipIface)
- {
-     bool foundNewFilter = false;
- 
--    int rc = _virNWFilterInstantiateFilter(conn, vmuuid, net,
-+    int rc = _virNWFilterInstantiateFilter(driver, vmuuid, net,
-                                            0,
-                                            INSTANTIATE_FOLLOW_NEWFILTER,
-                                            &foundNewFilter);
-@@ -1154,7 +1154,7 @@ virNWFilterDomainFWUpdateCB(virDomainObjPtr obj,
-             if ((net->filter) && (net->ifname)) {
-                 switch (cb->step) {
-                 case STEP_APPLY_NEW:
--                    ret = virNWFilterUpdateInstantiateFilter(cb->conn,
-+                    ret = virNWFilterUpdateInstantiateFilter(cb->opaque,
-                                                              vm->uuid,
-                                                              net,
-                                                              &skipIface);
-@@ -1179,7 +1179,7 @@ virNWFilterDomainFWUpdateCB(virDomainObjPtr obj,
-                     break;
- 
-                 case STEP_APPLY_CURRENT:
--                    ret = virNWFilterInstantiateFilter(cb->conn,
-+                    ret = virNWFilterInstantiateFilter(cb->opaque,
-                                                        vm->uuid,
-                                                        net);
-                     if (ret)
-diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter_gentech_driver.h
-index 4b47b4a..8528e2a 100644
---- a/src/nwfilter/nwfilter_gentech_driver.h
-+++ b/src/nwfilter/nwfilter_gentech_driver.h
-@@ -39,23 +39,23 @@ enum instCase {
- };
- 
- 
--int virNWFilterInstantiateFilter(virConnectPtr conn,
-+int virNWFilterInstantiateFilter(virNWFilterDriverStatePtr driver,
-                                  const unsigned char *vmuuid,
-                                  const virDomainNetDefPtr net);
--int virNWFilterUpdateInstantiateFilter(virConnectPtr conn,
-+int virNWFilterUpdateInstantiateFilter(virNWFilterDriverStatePtr driver,
-                                        const unsigned char *vmuuid,
-                                        const virDomainNetDefPtr net,
-                                        bool *skipIface);
- 
--int virNWFilterInstantiateFilterLate(const unsigned char *vmuuid,
-+int virNWFilterInstantiateFilterLate(virNWFilterDriverStatePtr driver,
-+                                     const unsigned char *vmuuid,
-                                      const char *ifname,
-                                      int ifindex,
-                                      const char *linkdev,
-                                      enum virDomainNetType nettype,
-                                      const virMacAddrPtr macaddr,
-                                      const char *filtername,
--                                     virNWFilterHashTablePtr filterparams,
--                                     virNWFilterDriverStatePtr driver);
-+                                     virNWFilterHashTablePtr filterparams);
- 
- int virNWFilterTeardownFilter(const virDomainNetDefPtr net);
- 
-diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c
-index 7e67203..093158a 100644
---- a/src/nwfilter/nwfilter_learnipaddr.c
-+++ b/src/nwfilter/nwfilter_learnipaddr.c
-@@ -612,15 +612,15 @@ learnIPAddressThread(void *arg)
-                           "cache for interface %s"), inetaddr, req->ifname);
-             }
- 
--            ret = virNWFilterInstantiateFilterLate(NULL,
-+            ret = virNWFilterInstantiateFilterLate(req->driver,
-+                                                   NULL,
-                                                    req->ifname,
-                                                    req->ifindex,
-                                                    req->linkdev,
-                                                    req->nettype,
-                                                    &req->macaddr,
-                                                    req->filtername,
--                                                   req->filterparams,
--                                                   req->driver);
-+                                                   req->filterparams);
-             VIR_DEBUG("Result from applying firewall rules on "
-                       "%s with IP addr %s : %d\n", req->ifname, inetaddr, ret);
-         }

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-Remove-use-of-virConnectPtr-from-all-remaining-nwfil.patch

@@ -1,382 +0,0 @@
-From 1766db28533e2b5a96792aa0811e5364e0bb54d4 Mon Sep 17 00:00:00 2001
-From: "Daniel P. Berrange" <berrange@redhat.com>
-Date: Thu, 3 Oct 2013 14:07:00 +0100
-Subject: [PATCH] Remove use of virConnectPtr from all remaining nwfilter code
-
-The virConnectPtr is passed around loads of nwfilter code in
-order to provide it as a parameter to the callback registered
-by the virt drivers. None of the virt drivers use this param
-though, so it serves no purpose.
-
-Avoiding the need to pass a virConnectPtr means that the
-nwfilterStateReload method no longer needs to open a bogus
-QEMU driver connection. This addresses a race condition that
-can lead to a crash on startup.
-
-The nwfilter driver starts before the QEMU driver and registers
-some callbacks with DBus to detect firewalld reload. If the
-firewalld reload happens while the QEMU driver is still starting
-up though, the nwfilterStateReload method will open a connection
-to the partially initialized QEMU driver and cause a crash.
-
-Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
----
- src/conf/nwfilter_conf.c       | 49 ++++++++++++++++--------------------------
- src/conf/nwfilter_conf.h       | 14 +++++-------
- src/lxc/lxc_driver.c           |  3 +--
- src/nwfilter/nwfilter_driver.c | 42 ++++++++++++++----------------------
- src/qemu/qemu_driver.c         |  3 +--
- src/uml/uml_driver.c           |  3 +--
- 6 files changed, 43 insertions(+), 71 deletions(-)
-
-diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
-index 9927f7e..7152aae 100644
---- a/src/conf/nwfilter_conf.c
-+++ b/src/conf/nwfilter_conf.c
-@@ -2744,8 +2744,7 @@ cleanup:
- 
- 
- static int
--_virNWFilterDefLoopDetect(virConnectPtr conn,
--                          virNWFilterObjListPtr nwfilters,
-+_virNWFilterDefLoopDetect(virNWFilterObjListPtr nwfilters,
-                           virNWFilterDefPtr def,
-                           const char *filtername)
- {
-@@ -2769,7 +2768,7 @@ _virNWFilterDefLoopDetect(virConnectPtr conn,
-             obj = virNWFilterObjFindByName(nwfilters,
-                                            entry->include->filterref);
-             if (obj) {
--                rc = _virNWFilterDefLoopDetect(conn, nwfilters,
-+                rc = _virNWFilterDefLoopDetect(nwfilters,
-                                                obj->def, filtername);
- 
-                 virNWFilterObjUnlock(obj);
-@@ -2785,7 +2784,6 @@ _virNWFilterDefLoopDetect(virConnectPtr conn,
- 
- /*
-  * virNWFilterDefLoopDetect:
-- * @conn: pointer to virConnect object
-  * @nwfilters : the nwfilters to search
-  * @def : the filter definition that may add a loop and is to be tested
-  *
-@@ -2795,11 +2793,10 @@ _virNWFilterDefLoopDetect(virConnectPtr conn,
-  * Returns 0 in case no loop was detected, -1 otherwise.
-  */
- static int
--virNWFilterDefLoopDetect(virConnectPtr conn,
--                         virNWFilterObjListPtr nwfilters,
-+virNWFilterDefLoopDetect(virNWFilterObjListPtr nwfilters,
-                          virNWFilterDefPtr def)
- {
--    return _virNWFilterDefLoopDetect(conn, nwfilters, def, def->name);
-+    return _virNWFilterDefLoopDetect(nwfilters, def, def->name);
- }
- 
- int nCallbackDriver;
-@@ -2858,7 +2855,7 @@ static void *virNWFilterDomainFWUpdateOpaque;
-  * error. This should be called upon reloading of the driver.
-  */
- int
--virNWFilterInstFiltersOnAllVMs(virConnectPtr conn)
-+virNWFilterInstFiltersOnAllVMs(void)
- {
-     size_t i;
-     struct domUpdateCBStruct cb = {
-@@ -2868,15 +2865,14 @@ virNWFilterInstFiltersOnAllVMs(virConnectPtr conn)
-     };
- 
-     for (i = 0; i < nCallbackDriver; i++)
--        callbackDrvArray[i]->vmFilterRebuild(conn,
--                                             virNWFilterDomainFWUpdateCB,
-+        callbackDrvArray[i]->vmFilterRebuild(virNWFilterDomainFWUpdateCB,
-                                              &cb);
- 
-     return 0;
- }
- 
- static int
--virNWFilterTriggerVMFilterRebuild(virConnectPtr conn)
-+virNWFilterTriggerVMFilterRebuild(void)
- {
-     size_t i;
-     int ret = 0;
-@@ -2890,8 +2886,7 @@ virNWFilterTriggerVMFilterRebuild(virConnectPtr conn)
-         return -1;
- 
-     for (i = 0; i < nCallbackDriver; i++) {
--        if (callbackDrvArray[i]->vmFilterRebuild(conn,
--                                                 virNWFilterDomainFWUpdateCB,
-+        if (callbackDrvArray[i]->vmFilterRebuild(virNWFilterDomainFWUpdateCB,
-                                                  &cb) < 0)
-             ret = -1;
-     }
-@@ -2900,15 +2895,13 @@ virNWFilterTriggerVMFilterRebuild(virConnectPtr conn)
-         cb.step = STEP_TEAR_NEW; /* rollback */
- 
-         for (i = 0; i < nCallbackDriver; i++)
--            callbackDrvArray[i]->vmFilterRebuild(conn,
--                                                 virNWFilterDomainFWUpdateCB,
-+            callbackDrvArray[i]->vmFilterRebuild(virNWFilterDomainFWUpdateCB,
-                                                  &cb);
-     } else {
-         cb.step = STEP_TEAR_OLD; /* switch over */
- 
-         for (i = 0; i < nCallbackDriver; i++)
--            callbackDrvArray[i]->vmFilterRebuild(conn,
--                                                 virNWFilterDomainFWUpdateCB,
-+            callbackDrvArray[i]->vmFilterRebuild(virNWFilterDomainFWUpdateCB,
-                                                  &cb);
-     }
- 
-@@ -2919,14 +2912,13 @@ virNWFilterTriggerVMFilterRebuild(virConnectPtr conn)
- 
- 
- int
--virNWFilterTestUnassignDef(virConnectPtr conn,
--                           virNWFilterObjPtr nwfilter)
-+virNWFilterTestUnassignDef(virNWFilterObjPtr nwfilter)
- {
-     int rc = 0;
- 
-     nwfilter->wantRemoved = 1;
-     /* trigger the update on VMs referencing the filter */
--    if (virNWFilterTriggerVMFilterRebuild(conn))
-+    if (virNWFilterTriggerVMFilterRebuild())
-         rc = -1;
- 
-     nwfilter->wantRemoved = 0;
-@@ -2965,8 +2957,7 @@ cleanup:
- }
- 
- virNWFilterObjPtr
--virNWFilterObjAssignDef(virConnectPtr conn,
--                        virNWFilterObjListPtr nwfilters,
-+virNWFilterObjAssignDef(virNWFilterObjListPtr nwfilters,
-                         virNWFilterDefPtr def)
- {
-     virNWFilterObjPtr nwfilter;
-@@ -2985,7 +2976,7 @@ virNWFilterObjAssignDef(virConnectPtr conn,
-         virNWFilterObjUnlock(nwfilter);
-     }
- 
--    if (virNWFilterDefLoopDetect(conn, nwfilters, def) < 0) {
-+    if (virNWFilterDefLoopDetect(nwfilters, def) < 0) {
-         virReportError(VIR_ERR_OPERATION_FAILED,
-                        "%s", _("filter would introduce a loop"));
-         return NULL;
-@@ -3004,7 +2995,7 @@ virNWFilterObjAssignDef(virConnectPtr conn,
- 
-         nwfilter->newDef = def;
-         /* trigger the update on VMs referencing the filter */
--        if (virNWFilterTriggerVMFilterRebuild(conn)) {
-+        if (virNWFilterTriggerVMFilterRebuild()) {
-             nwfilter->newDef = NULL;
-             virNWFilterUnlockFilterUpdates();
-             virNWFilterObjUnlock(nwfilter);
-@@ -3046,8 +3037,7 @@ virNWFilterObjAssignDef(virConnectPtr conn,
- 
- 
- static virNWFilterObjPtr
--virNWFilterObjLoad(virConnectPtr conn,
--                   virNWFilterObjListPtr nwfilters,
-+virNWFilterObjLoad(virNWFilterObjListPtr nwfilters,
-                    const char *file,
-                    const char *path)
- {
-@@ -3066,7 +3056,7 @@ virNWFilterObjLoad(virConnectPtr conn,
-         return NULL;
-     }
- 
--    if (!(nwfilter = virNWFilterObjAssignDef(conn, nwfilters, def))) {
-+    if (!(nwfilter = virNWFilterObjAssignDef(nwfilters, def))) {
-         virNWFilterDefFree(def);
-         return NULL;
-     }
-@@ -3082,8 +3072,7 @@ virNWFilterObjLoad(virConnectPtr conn,
- 
- 
- int
--virNWFilterLoadAllConfigs(virConnectPtr conn,
--                          virNWFilterObjListPtr nwfilters,
-+virNWFilterLoadAllConfigs(virNWFilterObjListPtr nwfilters,
-                           const char *configDir)
- {
-     DIR *dir;
-@@ -3111,7 +3100,7 @@ virNWFilterLoadAllConfigs(virConnectPtr conn,
-         if (!(path = virFileBuildPath(configDir, entry->d_name, NULL)))
-             continue;
- 
--        nwfilter = virNWFilterObjLoad(conn, nwfilters, entry->d_name, path);
-+        nwfilter = virNWFilterObjLoad(nwfilters, entry->d_name, path);
-         if (nwfilter)
-             virNWFilterObjUnlock(nwfilter);
- 
-diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h
-index e470615..29906f1 100644
---- a/src/conf/nwfilter_conf.h
-+++ b/src/conf/nwfilter_conf.h
-@@ -687,12 +687,10 @@ int virNWFilterObjSaveDef(virNWFilterDriverStatePtr driver,
- 
- int virNWFilterObjDeleteDef(virNWFilterObjPtr nwfilter);
- 
--virNWFilterObjPtr virNWFilterObjAssignDef(virConnectPtr conn,
--                                          virNWFilterObjListPtr nwfilters,
-+virNWFilterObjPtr virNWFilterObjAssignDef(virNWFilterObjListPtr nwfilters,
-                                           virNWFilterDefPtr def);
- 
--int virNWFilterTestUnassignDef(virConnectPtr conn,
--                               virNWFilterObjPtr nwfilter);
-+int virNWFilterTestUnassignDef(virNWFilterObjPtr nwfilter);
- 
- virNWFilterDefPtr virNWFilterDefParseNode(xmlDocPtr xml,
-                                           xmlNodePtr root);
-@@ -706,8 +704,7 @@ int virNWFilterSaveXML(const char *configDir,
- int virNWFilterSaveConfig(const char *configDir,
-                           virNWFilterDefPtr def);
- 
--int virNWFilterLoadAllConfigs(virConnectPtr conn,
--                              virNWFilterObjListPtr nwfilters,
-+int virNWFilterLoadAllConfigs(virNWFilterObjListPtr nwfilters,
-                               const char *configDir);
- 
- char *virNWFilterConfigFile(const char *dir,
-@@ -725,11 +722,10 @@ void virNWFilterUnlockFilterUpdates(void);
- int virNWFilterConfLayerInit(virDomainObjListIterator domUpdateCB, void *opaque);
- void virNWFilterConfLayerShutdown(void);
- 
--int virNWFilterInstFiltersOnAllVMs(virConnectPtr conn);
-+int virNWFilterInstFiltersOnAllVMs(void);
- 
- 
--typedef int (*virNWFilterRebuild)(virConnectPtr conn,
--                                  virDomainObjListIterator domUpdateCB,
-+typedef int (*virNWFilterRebuild)(virDomainObjListIterator domUpdateCB,
-                                   void *data);
- typedef void (*virNWFilterVoidCall)(void);
- 
-diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
-index 8b13f84..e3a34d6 100644
---- a/src/lxc/lxc_driver.c
-+++ b/src/lxc/lxc_driver.c
-@@ -84,8 +84,7 @@ virLXCDriverPtr lxc_driver = NULL;
- 
- /* callbacks for nwfilter */
- static int
--lxcVMFilterRebuild(virConnectPtr conn ATTRIBUTE_UNUSED,
--                   virDomainObjListIterator iter, void *data)
-+lxcVMFilterRebuild(virDomainObjListIterator iter, void *data)
- {
-     return virDomainObjListForEach(lxc_driver->domains, iter, data);
- }
-diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
-index 6e20e03..d25c6f2 100644
---- a/src/nwfilter/nwfilter_driver.c
-+++ b/src/nwfilter/nwfilter_driver.c
-@@ -235,8 +235,7 @@ nwfilterStateInitialize(bool privileged,
- 
-     VIR_FREE(base);
- 
--    if (virNWFilterLoadAllConfigs(NULL,
--                                  &driverState->nwfilters,
-+    if (virNWFilterLoadAllConfigs(&driverState->nwfilters,
-                                   driverState->configDir) < 0)
-         goto error;
- 
-@@ -272,37 +271,28 @@ err_free_driverstate:
-  * files and update its state
-  */
- static int
--nwfilterStateReload(void) {
--    virConnectPtr conn;
--
--    if (!driverState) {
-+nwfilterStateReload(void)
-+{
-+    if (!driverState)
-         return -1;
--    }
- 
-     if (!driverState->privileged)
-         return 0;
- 
--    conn = virConnectOpen("qemu:///system");
--
--    if (conn) {
--        virNWFilterDHCPSnoopEnd(NULL);
--        /* shut down all threads -- they will be restarted if necessary */
--        virNWFilterLearnThreadsTerminate(true);
--
--        nwfilterDriverLock(driverState);
--        virNWFilterCallbackDriversLock();
-+    virNWFilterDHCPSnoopEnd(NULL);
-+    /* shut down all threads -- they will be restarted if necessary */
-+    virNWFilterLearnThreadsTerminate(true);
- 
--        virNWFilterLoadAllConfigs(conn,
--                                  &driverState->nwfilters,
--                                  driverState->configDir);
-+    nwfilterDriverLock(driverState);
-+    virNWFilterCallbackDriversLock();
- 
--        virNWFilterCallbackDriversUnlock();
--        nwfilterDriverUnlock(driverState);
-+    virNWFilterLoadAllConfigs(&driverState->nwfilters,
-+                              driverState->configDir);
- 
--        virNWFilterInstFiltersOnAllVMs(conn);
-+    virNWFilterCallbackDriversUnlock();
-+    nwfilterDriverUnlock(driverState);
- 
--        virConnectClose(conn);
--    }
-+    virNWFilterInstFiltersOnAllVMs();
- 
-     return 0;
- }
-@@ -573,7 +563,7 @@ nwfilterDefineXML(virConnectPtr conn,
-     if (virNWFilterDefineXMLEnsureACL(conn, def) < 0)
-         goto cleanup;
- 
--    if (!(nwfilter = virNWFilterObjAssignDef(conn, &driver->nwfilters, def)))
-+    if (!(nwfilter = virNWFilterObjAssignDef(&driver->nwfilters, def)))
-         goto cleanup;
- 
-     if (virNWFilterObjSaveDef(driver, nwfilter, def) < 0) {
-@@ -617,7 +607,7 @@ nwfilterUndefine(virNWFilterPtr obj) {
-     if (virNWFilterUndefineEnsureACL(obj->conn, nwfilter->def) < 0)
-         goto cleanup;
- 
--    if (virNWFilterTestUnassignDef(obj->conn, nwfilter) < 0) {
-+    if (virNWFilterTestUnassignDef(nwfilter) < 0) {
-         virReportError(VIR_ERR_OPERATION_INVALID,
-                        "%s",
-                        _("nwfilter is in use"));
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index e8bc04d..068d29f 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -177,8 +177,7 @@ static void
- qemuVMDriverUnlock(void) {}
- 
- static int
--qemuVMFilterRebuild(virConnectPtr conn ATTRIBUTE_UNUSED,
--                    virDomainObjListIterator iter, void *data)
-+qemuVMFilterRebuild(virDomainObjListIterator iter, void *data)
- {
-     return virDomainObjListForEach(qemu_driver->domains, iter, data);
- }
-diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
-index 9ca352f..eb02542 100644
---- a/src/uml/uml_driver.c
-+++ b/src/uml/uml_driver.c
-@@ -148,8 +148,7 @@ static int umlMonitorCommand(const struct uml_driver *driver,
- static struct uml_driver *uml_driver = NULL;
- 
- static int
--umlVMFilterRebuild(virConnectPtr conn ATTRIBUTE_UNUSED,
--                   virDomainObjListIterator iter, void *data)
-+umlVMFilterRebuild(virDomainObjListIterator iter, void *data)
- {
-     return virDomainObjListForEach(uml_driver->domains, iter, data);
- }

0006-qemu-cgroup-Fix-crash-if-starting-nographics-guest.patch

@@ -1,31 +0,0 @@
-From 009332c5530a3f3419578b62b44a98ff8de31ca2 Mon Sep 17 00:00:00 2001
-From: Cole Robinson <crobinso@redhat.com>
-Date: Tue, 1 Oct 2013 07:55:19 -0400
-Subject: [PATCH] qemu: cgroup: Fix crash if starting nographics guest
-
-We can dereference graphics[0] even if guest has no graphics device
-configured. I screwed this up in a216e6487255d3b65d97c7ec1fa5da63dbced902
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1014088
-(cherry picked from commit a924d9d083c215df6044387057c501d9aa338b96)
----
- src/qemu/qemu_cgroup.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
-index f95c7f2..ace7e35 100644
---- a/src/qemu/qemu_cgroup.c
-+++ b/src/qemu/qemu_cgroup.c
-@@ -490,9 +490,10 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver,
- 
-     if (vm->def->nsounds &&
-         ((!vm->def->ngraphics && cfg->nogfxAllowHostAudio) ||
--         ((vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
-+         (vm->def->graphics &&
-+          ((vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
-            cfg->vncAllowHostAudio) ||
--           (vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL)))) {
-+           (vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL))))) {
-         rv = virCgroupAllowDeviceMajor(priv->cgroup, 'c', DEVICE_SND_MAJOR,
-                                        VIR_CGROUP_DEVICE_RW);
-         virDomainAuditCgroupMajor(vm, priv->cgroup, "allow", DEVICE_SND_MAJOR,

sources

@@ -1,2 +1 @@
-1835bbfa492099bce12e2934870e5611  libvirt-1.1.2.tar.gz
-b0dfe373ebe0c588b42a28c14d36a3e6  libvirt-1.1.3.tar.gz
+SHA512 (libvirt-2.2.1.tar.xz) = b89a2665bea81c440afc3f9f69c26e314344f1f2fbf53f82b25bdddcc89532ddf3393902e9cf552edb827ce5d8b46b9214b5a25303b19cf0f3f085131d870518