[PATCH 27/33] qemu: Remove return value from qemuMonitorDomainBlockThresholdCallback

Peter Krempa pkrempa at redhat.com
Wed Jul 21 10:42:39 UTC 2021


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

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_monitor.h | 12 ++++++------
 src/qemu/qemu_process.c |  4 +---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index c9be99e394..22a07d7054 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -277,12 +277,12 @@ typedef void (*qemuMonitorDomainAcpiOstInfoCallback)(qemuMonitor *mon,
                                                      void *opaque);


-typedef int (*qemuMonitorDomainBlockThresholdCallback)(qemuMonitor *mon,
-                                                       virDomainObj *vm,
-                                                       const char *nodename,
-                                                       unsigned long long threshold,
-                                                       unsigned long long excess,
-                                                       void *opaque);
+typedef void (*qemuMonitorDomainBlockThresholdCallback)(qemuMonitor *mon,
+                                                        virDomainObj *vm,
+                                                        const char *nodename,
+                                                        unsigned long long threshold,
+                                                        unsigned long long excess,
+                                                        void *opaque);


 typedef enum {
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index c012e8b4de..c6ab36d005 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1431,7 +1431,7 @@ qemuProcessHandleAcpiOstInfo(qemuMonitor *mon G_GNUC_UNUSED,
 }


-static int
+static void
 qemuProcessHandleBlockThreshold(qemuMonitor *mon G_GNUC_UNUSED,
                                 virDomainObj *vm,
                                 const char *nodename,
@@ -1478,8 +1478,6 @@ qemuProcessHandleBlockThreshold(qemuMonitor *mon G_GNUC_UNUSED,
     virObjectUnlock(vm);
     virObjectEventStateQueue(driver->domainEventState, eventDevice);
     virObjectEventStateQueue(driver->domainEventState, eventSource);
-
-    return 0;
 }


-- 
2.31.1




More information about the libvir-list mailing list