Add missing patch

Signed-off-by: Cole Robinson <crobinso@redhat.com>
Fix tests on aarch64
2022-11-20 13:38:04 -05:00 · 2022-11-20 13:33:41 -05:00 · 2022-11-20 13:15:08 -05:00 · 2022-10-17 13:25:03 +08:00 · 2022-08-09 09:18:37 -04:00 · 2022-08-04 15:58:25 -04:00
14 changed files with 2261 additions and 3380 deletions
@@ -0,0 +1,31 @@
+[suppress_function]
+symbol_version_regexp = LIBVIRT_PRIVATE.*
+soname_regexp = libvirt\\.so.*
+
+[suppress_function]
+symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.*
+soname_regexp = libvirt-admin\\.so.*
+
+[suppress_variable]
+symbol_version_regexp = LIBVIRT_PRIVATE.*
+soname_regexp = libvirt\\.so.*
+
+[suppress_variable]
+symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.*
+soname_regexp = libvirt-admin\\.so.*
+
+[suppress_function]
+symbol_version_regexp = .*
+soname_regexp = libvirt_storage_.*\\.so.*
+
+[suppress_variable]
+symbol_version_regexp = .*
+soname_regexp = libvirt_storage_.*\\.so.*
+
+[suppress_function]
+symbol_version_regexp = .*
+soname_regexp = libvirt_driver_.*\\.so.*
+
+[suppress_variable]
+symbol_version_regexp = .*
+soname_regexp = libvirt_driver_.*\\.so.*
@@ -2,4 +2,4 @@
 *.rpm
 i686
 x86_64
-libvirt-*.tar.gz
+libvirt-*.tar.xz
@@ -0,0 +1,35 @@
+From 9493c9b79dc541ec9e0fd73c6d87bdf8d30aaa90 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Mon, 1 Aug 2022 15:20:38 -0400
+Subject: [PATCH] lxc: containter: fix build with glibc 2.36
+Content-type: text/plain
+
+With glibc 2.36, sys/mount.h and linux/mount.h conflict:
+https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+
+lxc_container.c imports sys/mount.h and linux/fs.h, which pulls in
+linux/mount.h.
+
+linux/fs.h isn't required here though. glibc sys/mount.h has had
+MS_MOVE since 2.12 in 2010
+
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+---
+ src/lxc/lxc_container.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
+index b5278831da..a5401c2186 100644
+--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
+@@ -33,9 +33,6 @@
+ /* Yes, we want linux private one, for _syscall2() macro */
+ #include <linux/unistd.h>
+ 
+-/* For MS_MOVE */
+-#include <linux/fs.h>
+-
+ #if WITH_CAPNG
+ # include <cap-ng.h>
+ #endif
@@ -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;
@@ -0,0 +1,239 @@
+From 99b40587e8cd83a136d94e208d32a80be76dc22a Mon Sep 17 00:00:00 2001
+Message-Id: <99b40587e8cd83a136d94e208d32a80be76dc22a.1666875466.git.crobinso@redhat.com>
+From: Cole Robinson <crobinso@redhat.com>
+Date: Thu, 27 Oct 2022 08:51:25 -0400
+Subject: [PATCH] tests: Fix libxlxml2domconfigtest with latest xen
+Content-type: text/plain
+
+shadow_memkb is populated from a libxl API call, and the value can
+change. For example:
+https://xenbits.xen.org/gitweb/?p=xen.git;a=commit;h=2c992810854a15b41be920519ce83a4a328d5168
+
+Mock libxl_get_required_shadow_memory to give consistent output
+
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+---
+ tests/libxlmock.c                                     | 11 +++++++++++
+ tests/libxlxml2domconfigdata/basic-hvm.json           |  2 +-
+ tests/libxlxml2domconfigdata/basic-pv.json            |  2 +-
+ tests/libxlxml2domconfigdata/basic-pvh.json           |  2 +-
+ tests/libxlxml2domconfigdata/cpu-shares-hvm.json      |  2 +-
+ tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json  |  2 +-
+ .../fullvirt-cpuid-legacy-nest.json                   |  2 +-
+ tests/libxlxml2domconfigdata/fullvirt-cpuid.json      |  2 +-
+ .../libxlxml2domconfigdata/max-eventchannels-hvm.json |  2 +-
+ tests/libxlxml2domconfigdata/max-gntframes-hvm.json   |  2 +-
+ tests/libxlxml2domconfigdata/moredevs-hvm.json        |  2 +-
+ tests/libxlxml2domconfigdata/multiple-ip.json         |  2 +-
+ tests/libxlxml2domconfigdata/variable-clock-hvm.json  |  2 +-
+ .../libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json |  2 +-
+ tests/libxlxml2domconfigdata/vnuma-hvm.json           |  2 +-
+ 15 files changed, 25 insertions(+), 14 deletions(-)
+
+diff --git a/tests/libxlmock.c b/tests/libxlmock.c
+index 0e4bf7df52..4754597e5b 100644
+--- a/tests/libxlmock.c
+++ b/tests/libxlmock.c
+@@ -109,6 +109,17 @@ VIR_MOCK_STUB_RET_ARGS(bind,
+                        const struct sockaddr *, addr,
+                        socklen_t, addrlen)
+ 
+VIR_MOCK_IMPL_RET_ARGS(libxl_get_required_shadow_memory,
+                       unsigned long,
+                       unsigned long, maxmem_kb,
+                       unsigned int, smp_cpus)
+{
+    /* silence gcc warning about unused function */
+    if (0)
+        real_libxl_get_required_shadow_memory(maxmem_kb, smp_cpus);
+    return 1234;
+}
+
+ VIR_MOCK_IMPL_RET_ARGS(__xstat, int,
+                        int, ver,
+                        const char *, path,
+diff --git a/tests/libxlxml2domconfigdata/basic-hvm.json b/tests/libxlxml2domconfigdata/basic-hvm.json
+index 87f8cb7d8a..d30875420d 100644
+--- a/tests/libxlxml2domconfigdata/basic-hvm.json
+++ b/tests/libxlxml2domconfigdata/basic-hvm.json
+@@ -15,7 +15,7 @@
+         "max_memkb": 1048576,
+         "target_memkb": 1048576,
+         "video_memkb": 8192,
+-        "shadow_memkb": 12288,
+        "shadow_memkb": 1234,
+         "device_model_version": "qemu_xen",
+         "device_model": "/bin/true",
+         "sched_params": {
+diff --git a/tests/libxlxml2domconfigdata/basic-pv.json b/tests/libxlxml2domconfigdata/basic-pv.json
+index b71c3b0f49..32d188fabd 100644
+--- a/tests/libxlxml2domconfigdata/basic-pv.json
+++ b/tests/libxlxml2domconfigdata/basic-pv.json
+@@ -14,7 +14,7 @@
+         ],
+         "max_memkb": 524288,
+         "target_memkb": 524288,
+-        "shadow_memkb": 8192,
+        "shadow_memkb": 1234,
+         "sched_params": {
+ 
+         },
+diff --git a/tests/libxlxml2domconfigdata/basic-pvh.json b/tests/libxlxml2domconfigdata/basic-pvh.json
+index 48365c9026..f51957aa85 100644
+--- a/tests/libxlxml2domconfigdata/basic-pvh.json
+++ b/tests/libxlxml2domconfigdata/basic-pvh.json
+@@ -14,7 +14,7 @@
+         ],
+         "max_memkb": 524288,
+         "target_memkb": 524288,
+-        "shadow_memkb": 8192,
+        "shadow_memkb": 1234,
+         "sched_params": {
+ 
+         },
+diff --git a/tests/libxlxml2domconfigdata/cpu-shares-hvm.json b/tests/libxlxml2domconfigdata/cpu-shares-hvm.json
+index 2aa97e88c5..15105c83ad 100644
+--- a/tests/libxlxml2domconfigdata/cpu-shares-hvm.json
+++ b/tests/libxlxml2domconfigdata/cpu-shares-hvm.json
+@@ -15,7 +15,7 @@
+         "max_memkb": 1048576,
+         "target_memkb": 1048576,
+         "video_memkb": 8192,
+-        "shadow_memkb": 12288,
+        "shadow_memkb": 1234,
+         "device_model_version": "qemu_xen",
+         "device_model": "/bin/true",
+         "sched_params": {
+diff --git a/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json b/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json
+index a2d46797aa..26f5abefee 100644
+--- a/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json
+++ b/tests/libxlxml2domconfigdata/fullvirt-acpi-slic.json
+@@ -11,7 +11,7 @@
+         ],
+         "max_memkb": 592896,
+         "target_memkb": 403456,
+-        "shadow_memkb": 5656,
+        "shadow_memkb": 1234,
+         "sched_params": {
+         },
+         "apic": "True",
+diff --git a/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json b/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json
+index 6290655c20..740b82d2e6 100644
+--- a/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json
+++ b/tests/libxlxml2domconfigdata/fullvirt-cpuid-legacy-nest.json
+@@ -11,7 +11,7 @@
+         ],
+         "max_memkb": 592896,
+         "target_memkb": 403456,
+-        "shadow_memkb": 5656,
+        "shadow_memkb": 1234,
+         "cpuid": [
+             {
+                 "leaf": 1,
+diff --git a/tests/libxlxml2domconfigdata/fullvirt-cpuid.json b/tests/libxlxml2domconfigdata/fullvirt-cpuid.json
+index 811a4f0ac7..8bf41894a5 100644
+--- a/tests/libxlxml2domconfigdata/fullvirt-cpuid.json
+++ b/tests/libxlxml2domconfigdata/fullvirt-cpuid.json
+@@ -11,7 +11,7 @@
+         ],
+         "max_memkb": 592896,
+         "target_memkb": 403456,
+-        "shadow_memkb": 5656,
+        "shadow_memkb": 1234,
+         "cpuid": [
+             {
+                 "leaf": 1,
+diff --git a/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json b/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json
+index 4a5b0ca65f..6f0daa065f 100644
+--- a/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json
+++ b/tests/libxlxml2domconfigdata/max-eventchannels-hvm.json
+@@ -15,7 +15,7 @@
+         "max_memkb": 1048576,
+         "target_memkb": 1048576,
+         "video_memkb": 8192,
+-        "shadow_memkb": 12288,
+        "shadow_memkb": 1234,
+         "event_channels": 2047,
+         "device_model_version": "qemu_xen",
+         "device_model": "/bin/true",
+diff --git a/tests/libxlxml2domconfigdata/max-gntframes-hvm.json b/tests/libxlxml2domconfigdata/max-gntframes-hvm.json
+index 2883d057ff..35de588abc 100644
+--- a/tests/libxlxml2domconfigdata/max-gntframes-hvm.json
+++ b/tests/libxlxml2domconfigdata/max-gntframes-hvm.json
+@@ -15,7 +15,7 @@
+         "max_memkb": 1048576,
+         "target_memkb": 1048576,
+         "video_memkb": 8192,
+-        "shadow_memkb": 12288,
+        "shadow_memkb": 1234,
+         "max_grant_frames": 64,
+         "device_model_version": "qemu_xen",
+         "device_model": "/bin/true",
+diff --git a/tests/libxlxml2domconfigdata/moredevs-hvm.json b/tests/libxlxml2domconfigdata/moredevs-hvm.json
+index 58cf32a8d4..bdc9afc29b 100644
+--- a/tests/libxlxml2domconfigdata/moredevs-hvm.json
+++ b/tests/libxlxml2domconfigdata/moredevs-hvm.json
+@@ -17,7 +17,7 @@
+         "max_memkb": 1048576,
+         "target_memkb": 1048576,
+         "video_memkb": 8192,
+-        "shadow_memkb": 12288,
+        "shadow_memkb": 1234,
+         "device_model_version": "qemu_xen",
+         "device_model": "/bin/true",
+         "sched_params": {
+diff --git a/tests/libxlxml2domconfigdata/multiple-ip.json b/tests/libxlxml2domconfigdata/multiple-ip.json
+index 2db98b82f6..e0b37aa795 100644
+--- a/tests/libxlxml2domconfigdata/multiple-ip.json
+++ b/tests/libxlxml2domconfigdata/multiple-ip.json
+@@ -14,7 +14,7 @@
+         ],
+         "max_memkb": 524288,
+         "target_memkb": 524288,
+-        "shadow_memkb": 8192,
+        "shadow_memkb": 1234,
+         "sched_params": {
+ 
+         },
+diff --git a/tests/libxlxml2domconfigdata/variable-clock-hvm.json b/tests/libxlxml2domconfigdata/variable-clock-hvm.json
+index 9a25d51da2..3c131c603c 100644
+--- a/tests/libxlxml2domconfigdata/variable-clock-hvm.json
+++ b/tests/libxlxml2domconfigdata/variable-clock-hvm.json
+@@ -15,7 +15,7 @@
+         "max_memkb": 1048576,
+         "target_memkb": 1048576,
+         "video_memkb": 8192,
+-        "shadow_memkb": 12288,
+        "shadow_memkb": 1234,
+         "rtc_timeoffset": 3600,
+         "localtime": "True",
+         "device_model_version": "qemu_xen",
+diff --git a/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json b/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json
+index 6cda8d0252..6725df9112 100644
+--- a/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json
+++ b/tests/libxlxml2domconfigdata/vnuma-hvm-legacy-nest.json
+@@ -103,7 +103,7 @@
+         "max_memkb": 1048576,
+         "target_memkb": 1048576,
+         "video_memkb": 8192,
+-        "shadow_memkb": 14336,
+        "shadow_memkb": 1234,
+         "device_model_version": "qemu_xen",
+         "device_model": "/bin/true",
+         "sched_params": {
+diff --git a/tests/libxlxml2domconfigdata/vnuma-hvm.json b/tests/libxlxml2domconfigdata/vnuma-hvm.json
+index f578ccd3d3..2556c82d5f 100644
+--- a/tests/libxlxml2domconfigdata/vnuma-hvm.json
+++ b/tests/libxlxml2domconfigdata/vnuma-hvm.json
+@@ -103,7 +103,7 @@
+         "max_memkb": 1048576,
+         "target_memkb": 1048576,
+         "video_memkb": 8192,
+-        "shadow_memkb": 14336,
+        "shadow_memkb": 1234,
+         "device_model_version": "qemu_xen",
+         "device_model": "/bin/true",
+         "sched_params": {
+-- 
+2.37.3
+
@@ -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;
- }
@@ -0,0 +1,40 @@
+From c0d9adf220dc0d223330a7bac37b174132d330ba Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Mon, 1 Aug 2022 15:24:01 -0400
+Subject: [PATCH] virfile: Fix build with glibc 2.36
+Content-type: text/plain
+
+With glibc 2.36, sys/mount.h and linux/mount.h conflict:
+https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
+
+virfile.c imports sys/mount.h and linux/fs.h, which pulls in
+linux/mount.h.
+
+Manually define the constants we need from linux/fs.h, like was
+done in llvm:
+
+https://reviews.llvm.org/rGb379129c4beb3f26223288627a1291739f33af02
+
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+---
+ src/util/virfile.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/util/virfile.c b/src/util/virfile.c
+index 99da058db3..ce541b8946 100644
+--- a/src/util/virfile.c
+++ b/src/util/virfile.c
+@@ -71,7 +71,11 @@
+ # endif
+ # include <sys/ioctl.h>
+ # include <linux/cdrom.h>
+-# include <linux/fs.h>
+/* These come from linux/fs.h, but that header conflicts with
+ * sys/mount.h on glibc 2.36+ */
+# define FS_IOC_GETFLAGS _IOR('f', 1, long)
+# define FS_IOC_SETFLAGS _IOW('f', 2, long)
+# define FS_NOCOW_FL 0x00800000
+ #endif
+ 
+ #if WITH_LIBATTR
@@ -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;
@@ -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);
-         }
@@ -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);
- }
@@ -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,
@@ -1,21 +0,0 @@
-# Makefile for source rpm: libvirt
-# $Id$
-NAME := libvirt
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
@@ -1,2 +1 @@
-1835bbfa492099bce12e2934870e5611  libvirt-1.1.2.tar.gz
-b0dfe373ebe0c588b42a28c14d36a3e6  libvirt-1.1.3.tar.gz
+SHA512 (libvirt-8.6.0.tar.xz) = 6198ac33ea718045bfd12a2740d5a7fa70c754b1ecda7c0cad5791fbdf7311091587056254fde88ebe3c2f927a8fb56909fe4c3a115595854b18d3a704db73de