[PATCH 15/33] qemu: Remove return value from qemuMonitorDomainPMWakeupCallback

Peter Krempa pkrempa at redhat.com
Wed Jul 21 10:42:27 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 d080b42613..f846bc521d 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -221,9 +221,9 @@ typedef void (*qemuMonitorDomainTrayChangeCallback)(qemuMonitor *mon,
                                                     const char *devid,
                                                     int reason,
                                                     void *opaque);
-typedef int (*qemuMonitorDomainPMWakeupCallback)(qemuMonitor *mon,
-                                                 virDomainObj *vm,
-                                                 void *opaque);
+typedef void (*qemuMonitorDomainPMWakeupCallback)(qemuMonitor *mon,
+                                                  virDomainObj *vm,
+                                                  void *opaque);
 typedef int (*qemuMonitorDomainPMSuspendCallback)(qemuMonitor *mon,
                                                   virDomainObj *vm,
                                                   void *opaque);
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 79bed57f03..22e0c5fde2 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1125,7 +1125,7 @@ qemuProcessHandleTrayChange(qemuMonitor *mon G_GNUC_UNUSED,
     virObjectEventStateQueue(driver->domainEventState, event);
 }

-static int
+static void
 qemuProcessHandlePMWakeup(qemuMonitor *mon G_GNUC_UNUSED,
                           virDomainObj *vm,
                           void *opaque)
@@ -1160,7 +1160,6 @@ qemuProcessHandlePMWakeup(qemuMonitor *mon G_GNUC_UNUSED,
     virObjectUnlock(vm);
     virObjectEventStateQueue(driver->domainEventState, event);
     virObjectEventStateQueue(driver->domainEventState, lifecycleEvent);
-    return 0;
 }

 static int
-- 
2.31.1




More information about the libvir-list mailing list