From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 20 Jul 2021 08:05:06 +0000 (+0200)
Subject: qemu: Remove return value from qemuMonitorDomainNicRxFilterChangedCallback
X-Git-Tag: v7.6.0-rc1~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3d62ee3a5589d47998f971b527d00786b096371;p=thirdparty%2Flibvirt.git

qemu: Remove return value from qemuMonitorDomainNicRxFilterChangedCallback

Change the callback prototype and fix the callback registered in the
process code.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index c867466104..124d9719b2 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -242,10 +242,10 @@ typedef void (*qemuMonitorDomainDeviceDeletedCallback)(qemuMonitor *mon,
                                                        virDomainObj *vm,
                                                        const char *devAlias,
                                                        void *opaque);
-typedef int (*qemuMonitorDomainNicRxFilterChangedCallback)(qemuMonitor *mon,
-                                                           virDomainObj *vm,
-                                                           const char *devAlias,
-                                                           void *opaque);
+typedef void (*qemuMonitorDomainNicRxFilterChangedCallback)(qemuMonitor *mon,
+                                                            virDomainObj *vm,
+                                                            const char *devAlias,
+                                                            void *opaque);
 
 typedef int (*qemuMonitorDomainSerialChangeCallback)(qemuMonitor *mon,
                                                      virDomainObj *vm,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 4ca0ca3a10..88f8a23f8c 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1485,7 +1485,7 @@ qemuProcessHandleBlockThreshold(qemuMonitor *mon G_GNUC_UNUSED,
 }
 
 
-static int
+static void
 qemuProcessHandleNicRxFilterChanged(qemuMonitor *mon G_GNUC_UNUSED,
                                     virDomainObj *vm,
                                     const char *devAlias,
@@ -1514,7 +1514,7 @@ qemuProcessHandleNicRxFilterChanged(qemuMonitor *mon G_GNUC_UNUSED,
 
  cleanup:
     virObjectUnlock(vm);
-    return 0;
+    return;
  error:
     qemuProcessEventFree(processEvent);
     goto cleanup;