[PATCH 25/33] qemu: Remove return value from qemuMonitorDomainMigrationPassCallback

Peter Krempa pkrempa at redhat.com
Wed Jul 21 10:42:37 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 5d40658d53..cbf1098fa7 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -262,10 +262,10 @@ typedef void (*qemuMonitorDomainMigrationStatusCallback)(qemuMonitor *mon,
                                                          int status,
                                                          void *opaque);

-typedef int (*qemuMonitorDomainMigrationPassCallback)(qemuMonitor *mon,
-                                                      virDomainObj *vm,
-                                                      int pass,
-                                                      void *opaque);
+typedef void (*qemuMonitorDomainMigrationPassCallback)(qemuMonitor *mon,
+                                                       virDomainObj *vm,
+                                                       int pass,
+                                                       void *opaque);

 typedef int (*qemuMonitorDomainAcpiOstInfoCallback)(qemuMonitor *mon,
                                                     virDomainObj *vm,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 598cf58bf7..139bf7ccf1 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1639,7 +1639,7 @@ qemuProcessHandleMigrationStatus(qemuMonitor *mon G_GNUC_UNUSED,
 }


-static int
+static void
 qemuProcessHandleMigrationPass(qemuMonitor *mon G_GNUC_UNUSED,
                                virDomainObj *vm,
                                int pass,
@@ -1664,7 +1664,6 @@ qemuProcessHandleMigrationPass(qemuMonitor *mon G_GNUC_UNUSED,

  cleanup:
     virObjectUnlock(vm);
-    return 0;
 }


-- 
2.31.1




More information about the libvir-list mailing list