qemu: Remove return value from qemuMonitorDomainMigrationPassCallback

Change the callback prototype and fix the callback registered in the
process code.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 6fef99ebac110e0e49c1354672ac857930a065d2..b361d43628094e5e955f3489d05688f66dd6f7bc 100644 (file)
--- 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 55998a33146dd9fe62d9b895226d88a97997095c..3ba10bcae230bd69e46402c6434e50d851814a98 100644 (file)
--- 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;
 }