Disable -Werror on mingw builds

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Fix crash in event loop (CVE-2024-4418), event loop stall, GSource leak & udev leak
2024-06-05 13:44:49 +01:00 · 2024-06-05 13:31:00 +01:00 · 2024-03-12 16:25:51 +00:00 · 2024-01-03 13:42:36 -06:00 · 2023-09-01 12:27:57 +01:00 · 2023-08-01 08:10:39 -04:00
18 changed files with 2509 additions and 3472 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,40 @@
+From 76cdc7adf55723ff8da146bd3c15c64d0afd5d93 Mon Sep 17 00:00:00 2001
+From: Martin Kletzander <mkletzan@redhat.com>
+Date: Tue, 27 Feb 2024 16:20:12 +0100
+Subject: [PATCH] Fix off-by-one error in udevListInterfacesByStatus
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Ever since this function was introduced in 2012 it could've tried
+filling in an extra interface name.  That was made worse in 2019 when
+the caller functions started accepting NULL arrays of size 0.
+
+This is assigned CVE-2024-1441.
+
+Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
+Reported-by: Alexander Kuznetsov <kuznetsovam@altlinux.org>
+Fixes: 5a33366f5c0b18c93d161bd144f9f079de4ac8ca
+Fixes: d6064e2759a24e0802f363e3a810dc5a7d7ebb15
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+(cherry picked from commit c664015fe3a7bf59db26686e9ed69af011c6ebb8)
+---
+ src/interface/interface_backend_udev.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c
+index fb6799ed94..4091483060 100644
+--- a/src/interface/interface_backend_udev.c
+++ b/src/interface/interface_backend_udev.c
+@@ -222,7 +222,7 @@ udevListInterfacesByStatus(virConnectPtr conn,
+         g_autoptr(virInterfaceDef) def = NULL;
+ 
+         /* Ensure we won't exceed the size of our array */
+-        if (count > names_len)
+        if (count >= names_len)
+             break;
+ 
+         path = udev_list_entry_get_name(dev_entry);
+-- 
+2.43.0
+
@@ -0,0 +1,41 @@
+From 3499354e12a1c1832bf4030693a64e03ceb79d05 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Wed, 5 Jun 2024 11:16:21 +0100
+Subject: [PATCH] interface: fix udev reference leak with invalid flags
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The udevInterfaceGetXMLDesc method takes a reference on the udev
+driver as its first action. If the virCheckFlags() condition
+fails, however, this reference is never released.
+
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+---
+ src/interface/interface_backend_udev.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c
+index fdf11a8318..e1a50389c9 100644
+--- a/src/interface/interface_backend_udev.c
+++ b/src/interface/interface_backend_udev.c
+@@ -1027,12 +1027,14 @@ static char *
+ udevInterfaceGetXMLDesc(virInterfacePtr ifinfo,
+                         unsigned int flags)
+ {
+-    struct udev *udev = udev_ref(driver->udev);
+    struct udev *udev = NULL;
+     g_autoptr(virInterfaceDef) ifacedef = NULL;
+     char *xmlstr = NULL;
+ 
+     virCheckFlags(VIR_INTERFACE_XML_INACTIVE, NULL);
+ 
+    udev = udev_ref(driver->udev);
+
+     /* Recursively build up the interface XML based on the requested
+      * interface name
+      */
+-- 
+2.45.1
+
@@ -0,0 +1,90 @@
+From c120b31f826cd51127d28f8beaa61ac0d5f03048 Mon Sep 17 00:00:00 2001
+From: Dmitry Frolov <frolov@swemel.ru>
+Date: Tue, 12 Sep 2023 15:56:47 +0300
+Subject: [PATCH] interface: fix udev_device_get_sysattr_value return value
+ check
+
+Reviewing the code I found that return value of function
+udev_device_get_sysattr_value() is dereferenced without a check.
+udev_device_get_sysattr_value() may return NULL by number of reasons.
+
+v2: VIR_DEBUG added, replaced STREQ(NULLSTR()) with STREQ_NULLABLE()
+v3: More checks added, to skip earlier. More verbose VIR_DEBUG.
+
+Signed-off-by: Dmitry Frolov <frolov@swemel.ru>
+Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
+(cherry picked from commit 2ca94317ac642a70921947150ced8acc674ccdc8)
+---
+ src/interface/interface_backend_udev.c | 26 +++++++++++++++++++-------
+ 1 file changed, 19 insertions(+), 7 deletions(-)
+
+diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c
+index a0485ddd21..fb6799ed94 100644
+--- a/src/interface/interface_backend_udev.c
+++ b/src/interface/interface_backend_udev.c
+@@ -23,6 +23,7 @@
+ #include <dirent.h>
+ #include <libudev.h>
+ 
+#include "virlog.h"
+ #include "virerror.h"
+ #include "virfile.h"
+ #include "datatypes.h"
+@@ -40,6 +41,8 @@
+ 
+ #define VIR_FROM_THIS VIR_FROM_INTERFACE
+ 
+VIR_LOG_INIT("interface.interface_backend_udev");
+
+ struct udev_iface_driver {
+     struct udev *udev;
+     /* pid file FD, ensures two copies of the driver can't use the same root */
+@@ -354,11 +357,20 @@ udevConnectListAllInterfaces(virConnectPtr conn,
+         const char *macaddr;
+         g_autoptr(virInterfaceDef) def = NULL;
+ 
+-        path = udev_list_entry_get_name(dev_entry);
+-        dev = udev_device_new_from_syspath(udev, path);
+-        name = udev_device_get_sysname(dev);
+        if (!(path = udev_list_entry_get_name(dev_entry))) {
+            VIR_DEBUG("Skipping interface, path == NULL");
+            continue;
+        }
+        if (!(dev = udev_device_new_from_syspath(udev, path))) {
+            VIR_DEBUG("Skipping interface '%s', dev == NULL", path);
+            continue;
+        }
+        if (!(name = udev_device_get_sysname(dev))) {
+            VIR_DEBUG("Skipping interface '%s', name == NULL", path);
+            continue;
+        }
+         macaddr = udev_device_get_sysattr_value(dev, "address");
+-        status = STREQ(udev_device_get_sysattr_value(dev, "operstate"), "up");
+        status = STREQ_NULLABLE(udev_device_get_sysattr_value(dev, "operstate"), "up");
+ 
+         def = udevGetMinimalDefForDevice(dev);
+         if (!virConnectListAllInterfacesCheckACL(conn, def)) {
+@@ -964,9 +976,9 @@ udevGetIfaceDef(struct udev *udev, const char *name)
+ 
+     /* MTU */
+     mtu_str = udev_device_get_sysattr_value(dev, "mtu");
+-    if (virStrToLong_ui(mtu_str, NULL, 10, &mtu) < 0) {
+    if (!mtu_str || virStrToLong_ui(mtu_str, NULL, 10, &mtu) < 0) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+-                _("Could not parse MTU value '%1$s'"), mtu_str);
+                _("Could not parse MTU value '%1$s'"), NULLSTR(mtu_str));
+         goto error;
+     }
+     ifacedef->mtu = mtu;
+@@ -1089,7 +1101,7 @@ udevInterfaceIsActive(virInterfacePtr ifinfo)
+        goto cleanup;
+ 
+     /* Check if it's active or not */
+-    status = STREQ(udev_device_get_sysattr_value(dev, "operstate"), "up");
+    status = STREQ_NULLABLE(udev_device_get_sysattr_value(dev, "operstate"), "up");
+ 
+     udev_device_unref(dev);
+ 
+-- 
+2.43.0
+
@@ -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,49 @@
+From 98f1cf88fa7e0f992d93f376418fbfb3996a9690 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Fri, 17 May 2024 14:55:24 +0100
+Subject: [PATCH] rpc: avoid leak of GSource in use for interrupting main loop
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+We never release the reference on the GSource created for
+interrupting the main loop, nor do we remove it from the
+main context if our thread is woken up prior to the wakeup
+callback firing.
+
+This can result in a leak of GSource objects, along with an
+ever growing list of GSources attached to the main context,
+which will gradually slow down execution of the loop, as
+several operations are O(N) for the number of attached GSource
+objects.
+
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+---
+ src/rpc/virnetclient.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
+index 147b0d661a..6d424eb599 100644
+--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
+@@ -1946,7 +1946,7 @@ static int virNetClientIO(virNetClient *client,
+     /* Check to see if another thread is dispatching */
+     if (client->haveTheBuck) {
+         /* Force other thread to wakeup from poll */
+-        GSource *wakeup = g_idle_source_new();
+        g_autoptr(GSource) wakeup = g_idle_source_new();
+         g_source_set_callback(wakeup, virNetClientIOWakeup, client->eventLoop, NULL);
+         g_source_attach(wakeup, client->eventCtx);
+ 
+@@ -1968,6 +1968,7 @@ static int virNetClientIO(virNetClient *client,
+             return -1;
+         }
+ 
+        g_source_destroy(wakeup);
+         VIR_DEBUG("Woken up from sleep head=%p call=%p",
+                   client->waitDispatch, thiscall);
+         /* Three reasons we can be woken up
+-- 
+2.45.1
+
@@ -0,0 +1,99 @@
+From 8074d64dc2eca846d6a61efe1a9b7428a0ce1dd1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Tue, 30 Apr 2024 11:51:15 +0100
+Subject: [PATCH] rpc: ensure temporary GSource is removed from client event
+ loop
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Users are seeing periodic segfaults from libvirt client apps,
+especially thread heavy ones like virt-manager. A typical
+stack trace would end up in the virNetClientIOEventFD method,
+with illegal access to stale stack data. eg
+
+==238721==ERROR: AddressSanitizer: stack-use-after-return on address 0x75cd18709788 at pc 0x75cd3111f907 bp 0x75cd181ff550 sp 0x75cd181ff548
+WRITE of size 4 at 0x75cd18709788 thread T11
+    #0 0x75cd3111f906 in virNetClientIOEventFD /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/rpc/virnetclient.c:1634:15
+    #1 0x75cd3210d198  (/usr/lib/libglib-2.0.so.0+0x5a198) (BuildId: 0a2311dfbbc6c215dc36f4b6bdd2b4b6fbae55a2)
+    #2 0x75cd3216c3be  (/usr/lib/libglib-2.0.so.0+0xb93be) (BuildId: 0a2311dfbbc6c215dc36f4b6bdd2b4b6fbae55a2)
+    #3 0x75cd3210ddc6 in g_main_loop_run (/usr/lib/libglib-2.0.so.0+0x5adc6) (BuildId: 0a2311dfbbc6c215dc36f4b6bdd2b4b6fbae55a2)
+    #4 0x75cd3111a47c in virNetClientIOEventLoop /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/rpc/virnetclient.c:1722:9
+    #5 0x75cd3111a47c in virNetClientIO /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/rpc/virnetclient.c:2002:10
+    #6 0x75cd3111a47c in virNetClientSendInternal /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/rpc/virnetclient.c:2170:11
+    #7 0x75cd311198a8 in virNetClientSendWithReply /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/rpc/virnetclient.c:2198:11
+    #8 0x75cd31111653 in virNetClientProgramCall /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/rpc/virnetclientprogram.c:318:9
+    #9 0x75cd31241c8f in callFull /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/remote/remote_driver.c:6054:10
+    #10 0x75cd31241c8f in call /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/remote/remote_driver.c:6076:12
+    #11 0x75cd31241c8f in remoteNetworkGetXMLDesc /usr/src/debug/libvirt/libvirt-10.2.0/build/src/remote/remote_client_bodies.h:5959:9
+    #12 0x75cd31410ff7 in virNetworkGetXMLDesc /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/libvirt-network.c:952:15
+
+The root cause is a bad assumption in the virNetClientIOEventLoop
+method. This method is run by whichever thread currently owns the
+buck, and is responsible for handling I/O. Inside a for(;;) loop,
+this method creates a temporary GSource, adds it to the event loop
+and runs g_main_loop_run(). When I/O is ready, the GSource callback
+(virNetClientIOEventFD) will fire and call g_main_loop_quit(), and
+return G_SOURCE_REMOVE which results in the temporary GSource being
+destroyed. A g_autoptr() will then remove the last reference.
+
+What was overlooked, is that a second thread can come along and
+while it can't enter virNetClientIOEventLoop, it will register an
+idle source that uses virNetClientIOWakeup to interrupt the
+original thread's 'g_main_loop_run' call. When this happens the
+virNetClientIOEventFD callback never runs, and so the temporary
+GSource is not destroyed. The g_autoptr() will remove a reference,
+but by virtue of still being attached to the event context, there
+is an extra reference held causing GSource to be leaked. The
+next time 'g_main_loop_run' is called, the original GSource will
+trigger its callback, and access data that was allocated on the
+stack by the previous thread, and likely SEGV.
+
+To solve this, the thread calling 'g_main_loop_run' must call
+g_source_destroy, immediately upon return, to guarantee that
+the temporary GSource is removed.
+
+CVE-2024-4418
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Reported-by: Martin Shirokov <shirokovmartin@gmail.com>
+Tested-by: Martin Shirokov <shirokovmartin@gmail.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+---
+ src/rpc/virnetclient.c | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
+index 68098b1c8d..147b0d661a 100644
+--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
+@@ -1657,7 +1657,7 @@ static int virNetClientIOEventLoop(virNetClient *client,
+ #endif /* !WIN32 */
+         int timeout = -1;
+         virNetMessage *msg = NULL;
+-        g_autoptr(GSource) G_GNUC_UNUSED source = NULL;
+        g_autoptr(GSource) source = NULL;
+         GIOCondition ev = 0;
+         struct virNetClientIOEventData data = {
+             .client = client,
+@@ -1721,6 +1721,18 @@ static int virNetClientIOEventLoop(virNetClient *client,
+ 
+         g_main_loop_run(client->eventLoop);
+ 
+        /*
+         * If virNetClientIOEventFD ran, this GSource will already be
+         * destroyed due to G_SOURCE_REMOVE. It is harmless to re-destroy
+         * it, since we still own a reference.
+         *
+         * If virNetClientIOWakeup ran, it will have interrupted the
+         * g_main_loop_run call, before virNetClientIOEventFD could
+         * run, and thus the GSource is still registered, and we need
+         * to destroy it since it is referencing stack memory for 'data'
+         */
+        g_source_destroy(source);
+
+ #ifndef WIN32
+         ignore_value(pthread_sigmask(SIG_SETMASK, &oldmask, NULL));
+ #endif /* !WIN32 */
+-- 
+2.45.1
+
@@ -0,0 +1,76 @@
+From 7cb03e6a28e465c49f0cabe8fe2e7d21edb5aadf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Mon, 18 Dec 2023 12:17:18 +0000
+Subject: [PATCH] rpc: fix race in waking up client event loop
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The first thread to issue a client RPC request will own the event
+loop execution, sitting in the virNetClientIOEventLoop function.
+
+It releases the client lock while running:
+
+   virNetClientUnlock()
+   g_main_loop_run()
+   virNetClientLock()
+
+If a second thread arrives with an RPC request, it will queue it
+for the first thread to process. To inform the first thread that
+there's a new request it calls g_main_loop_quit() to break it out
+of the main loop.
+
+This works if the first thread is in g_main_loop_run() at that
+time. There is a small window of opportunity, however, where
+the first thread has released the client lock, but not yet got
+into g_main_loop_run(). If that happens, the wakeup from the
+second thread is lost.
+
+This patch deals with that by changing the way the wakeup is
+performed. Instead of directly calling g_main_loop_quit(), the
+second thread creates an idle source to run the quit function
+from within the first thread. This guarantees that the first
+thread will see the wakeup.
+
+Tested by: Fima Shevrin <efim.shevrin@virtuozzo.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Denis V. Lunev <den@openvz.org>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+---
+ src/rpc/virnetclient.c | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
+index 4ab8af68c5..68098b1c8d 100644
+--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
+@@ -1848,6 +1848,15 @@ static void virNetClientIOUpdateCallback(virNetClient *client,
+ }
+ 
+ 
+static gboolean virNetClientIOWakeup(gpointer opaque)
+{
+    GMainLoop *loop = opaque;
+
+    g_main_loop_quit(loop);
+
+    return G_SOURCE_REMOVE;
+}
+
+ /*
+  * This function sends a message to remote server and awaits a reply
+  *
+@@ -1925,7 +1934,9 @@ static int virNetClientIO(virNetClient *client,
+     /* Check to see if another thread is dispatching */
+     if (client->haveTheBuck) {
+         /* Force other thread to wakeup from poll */
+-        g_main_loop_quit(client->eventLoop);
+        GSource *wakeup = g_idle_source_new();
+        g_source_set_callback(wakeup, virNetClientIOWakeup, client->eventLoop, NULL);
+        g_source_attach(wakeup, client->eventCtx);
+ 
+         /* If we are non-blocking, detach the thread and keep the call in the
+          * queue. */
+-- 
+2.43.0
+
@@ -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;
- }
@@ -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)
@@ -0,0 +1,31 @@
+From c9056e682a8a67dc29e39eb01392fcf8ee978c31 Mon Sep 17 00:00:00 2001
+From: Jonathan Wright <jonathan@almalinux.org>
+Date: Wed, 3 Jan 2024 09:26:59 -0600
+Subject: [PATCH] conf: Restore setting default bus for input devices
+
+Prior to v9.3.0-rc1~30 we used to set default bus for <input/>
+devices, during XML parsing. In the commit this code was moved to
+a post parse callback. But somehow the line that sets the bus in
+one specific case disappeared. Bring it back.
+
+Resolves: https://gitlab.com/libvirt/libvirt/-/issues/577
+Fixes: c4bc4d3b82fbe22e03c986ca896090f481df5c10
+Signed-off-by: Jonathan Wright <jonathan@almalinux.org>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/conf/domain_postparse.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/conf/domain_postparse.c b/src/conf/domain_postparse.c
+index e79913b73f..ee27023f3e 100644
+--- a/src/conf/domain_postparse.c
+++ b/src/conf/domain_postparse.c
+@@ -657,6 +657,7 @@ virDomainInputDefPostParse(virDomainInputDef *input,
+             if ((input->type == VIR_DOMAIN_INPUT_TYPE_MOUSE ||
+                  input->type == VIR_DOMAIN_INPUT_TYPE_KBD) &&
+                 (ARCH_IS_X86(def->os.arch) || def->os.arch == VIR_ARCH_NONE)) {
+                    input->bus = VIR_DOMAIN_INPUT_BUS_PS2;
+             } else if (ARCH_IS_S390(def->os.arch) ||
+                        input->type == VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH) {
+                 input->bus = VIR_DOMAIN_INPUT_BUS_VIRTIO;
+-- 
@@ -1,2 +1 @@
-1835bbfa492099bce12e2934870e5611  libvirt-1.1.2.tar.gz
-b0dfe373ebe0c588b42a28c14d36a3e6  libvirt-1.1.3.tar.gz
+SHA512 (libvirt-9.7.0.tar.xz) = dd771822c0fa0861a32cab9d7f82235b101867fa0a4e8cf9a857ddfb2347e41b625b1e6f8791c4b3543fec836a1a23cae1fac4ce4b40debd51f2097bae46c949