[PATCH 04/33] qemu: Remove return value from qemuMonitorDomainShutdownCallback

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

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index d20b2e89d1..58968d940d 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -162,10 +162,10 @@ typedef void (*qemuMonitorDomainEventCallback)(qemuMonitor *mon,
                                                unsigned int micros,
                                                const char *details,
                                                void *opaque);
-typedef int (*qemuMonitorDomainShutdownCallback)(qemuMonitor *mon,
-                                                 virDomainObj *vm,
-                                                 virTristateBool guest,
-                                                 void *opaque);
+typedef void (*qemuMonitorDomainShutdownCallback)(qemuMonitor *mon,
+                                                  virDomainObj *vm,
+                                                  virTristateBool guest,
+                                                  void *opaque);
 typedef int (*qemuMonitorDomainResetCallback)(qemuMonitor *mon,
                                               virDomainObj *vm,
                                               void *opaque);
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 6b9658f5ac..925a774c3e 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -570,7 +570,7 @@ qemuProcessHandleEvent(qemuMonitor *mon G_GNUC_UNUSED,
 }


-static int
+static void
 qemuProcessHandleShutdown(qemuMonitor *mon G_GNUC_UNUSED,
                           virDomainObj *vm,
                           virTristateBool guest_initiated,
@@ -642,8 +642,6 @@ qemuProcessHandleShutdown(qemuMonitor *mon G_GNUC_UNUSED,
  unlock:
     virObjectUnlock(vm);
     virObjectEventStateQueue(driver->domainEventState, event);
-
-    return 0;
 }


-- 
2.31.1




More information about the libvir-list mailing list