[PATCH 18/33] qemu: Remove return value from qemuMonitorDomainPMSuspendDiskCallback

Peter Krempa pkrempa at redhat.com
Wed Jul 21 10:42:30 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 | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index fa3d0e1922..2cfcd40ab8 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -231,9 +231,9 @@ typedef void (*qemuMonitorDomainBalloonChangeCallback)(qemuMonitor *mon,
                                                        virDomainObj *vm,
                                                        unsigned long long actual,
                                                        void *opaque);
-typedef int (*qemuMonitorDomainPMSuspendDiskCallback)(qemuMonitor *mon,
-                                                      virDomainObj *vm,
-                                                      void *opaque);
+typedef void (*qemuMonitorDomainPMSuspendDiskCallback)(qemuMonitor *mon,
+                                                       virDomainObj *vm,
+                                                       void *opaque);
 typedef int (*qemuMonitorDomainGuestPanicCallback)(qemuMonitor *mon,
                                                    virDomainObj *vm,
                                                    qemuMonitorEventPanicInfo *info,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 421b9b5f11..ef0b9a4503 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1227,7 +1227,7 @@ qemuProcessHandleBalloonChange(qemuMonitor *mon G_GNUC_UNUSED,
     virObjectEventStateQueue(driver->domainEventState, event);
 }

-static int
+static void
 qemuProcessHandlePMSuspendDisk(qemuMonitor *mon G_GNUC_UNUSED,
                                virDomainObj *vm,
                                void *opaque)
@@ -1265,8 +1265,6 @@ qemuProcessHandlePMSuspendDisk(qemuMonitor *mon G_GNUC_UNUSED,

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


-- 
2.31.1




More information about the libvir-list mailing list