[PATCH 16/33] qemu: Remove return value from qemuMonitorDomainPMSuspendCallback

Peter Krempa pkrempa at redhat.com
Wed Jul 21 10:42:28 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 | 6 +++---
 src/qemu/qemu_process.c | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index f846bc521d..d678205bc0 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -224,9 +224,9 @@ typedef void (*qemuMonitorDomainTrayChangeCallback)(qemuMonitor *mon,
 typedef void (*qemuMonitorDomainPMWakeupCallback)(qemuMonitor *mon,
                                                   virDomainObj *vm,
                                                   void *opaque);
-typedef int (*qemuMonitorDomainPMSuspendCallback)(qemuMonitor *mon,
-                                                  virDomainObj *vm,
-                                                  void *opaque);
+typedef void (*qemuMonitorDomainPMSuspendCallback)(qemuMonitor *mon,
+                                                   virDomainObj *vm,
+                                                   void *opaque);
 typedef int (*qemuMonitorDomainBalloonChangeCallback)(qemuMonitor *mon,
                                                       virDomainObj *vm,
                                                       unsigned long long actual,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 22e0c5fde2..74a8bc7214 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1162,7 +1162,7 @@ qemuProcessHandlePMWakeup(qemuMonitor *mon G_GNUC_UNUSED,
     virObjectEventStateQueue(driver->domainEventState, lifecycleEvent);
 }

-static int
+static void
 qemuProcessHandlePMSuspend(qemuMonitor *mon G_GNUC_UNUSED,
                            virDomainObj *vm,
                            void *opaque)
@@ -1200,7 +1200,6 @@ qemuProcessHandlePMSuspend(qemuMonitor *mon G_GNUC_UNUSED,

     virObjectEventStateQueue(driver->domainEventState, event);
     virObjectEventStateQueue(driver->domainEventState, lifecycleEvent);
-    return 0;
 }

 static int
-- 
2.31.1




More information about the libvir-list mailing list