[PATCH 24/33] qemu: Remove return value from qemuMonitorDomainMigrationStatusCallback

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

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 09da2eee5a..5d40658d53 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -257,10 +257,10 @@ typedef void (*qemuMonitorDomainSpiceMigratedCallback)(qemuMonitor *mon,
                                                        virDomainObj *vm,
                                                        void *opaque);

-typedef int (*qemuMonitorDomainMigrationStatusCallback)(qemuMonitor *mon,
-                                                        virDomainObj *vm,
-                                                        int status,
-                                                        void *opaque);
+typedef void (*qemuMonitorDomainMigrationStatusCallback)(qemuMonitor *mon,
+                                                         virDomainObj *vm,
+                                                         int status,
+                                                         void *opaque);

 typedef int (*qemuMonitorDomainMigrationPassCallback)(qemuMonitor *mon,
                                                       virDomainObj *vm,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 4c1c7eca43..598cf58bf7 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1587,7 +1587,7 @@ qemuProcessHandleSpiceMigrated(qemuMonitor *mon G_GNUC_UNUSED,
 }


-static int
+static void
 qemuProcessHandleMigrationStatus(qemuMonitor *mon G_GNUC_UNUSED,
                                  virDomainObj *vm,
                                  int status,
@@ -1636,7 +1636,6 @@ qemuProcessHandleMigrationStatus(qemuMonitor *mon G_GNUC_UNUSED,
  cleanup:
     virObjectUnlock(vm);
     virObjectEventStateQueue(driver->domainEventState, event);
-    return 0;
 }


-- 
2.31.1




More information about the libvir-list mailing list