[PATCH 28/33] qemu: Remove return value from qemuMonitorDomainDumpCompletedCallback

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

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 22a07d7054..4ad14adb8b 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -303,12 +303,12 @@ struct _qemuMonitorDumpStats {
     unsigned long long total; /* total bytes to be written */
 };

-typedef int (*qemuMonitorDomainDumpCompletedCallback)(qemuMonitor *mon,
-                                                      virDomainObj *vm,
-                                                      int status,
-                                                      qemuMonitorDumpStats *stats,
-                                                      const char *error,
-                                                      void *opaque);
+typedef void (*qemuMonitorDomainDumpCompletedCallback)(qemuMonitor *mon,
+                                                       virDomainObj *vm,
+                                                       int status,
+                                                       qemuMonitorDumpStats *stats,
+                                                       const char *error,
+                                                       void *opaque);

 typedef int (*qemuMonitorDomainPRManagerStatusChangedCallback)(qemuMonitor *mon,
                                                                virDomainObj *vm,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index c6ab36d005..d7935fc03e 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1663,7 +1663,7 @@ qemuProcessHandleMigrationPass(qemuMonitor *mon G_GNUC_UNUSED,
 }


-static int
+static void
 qemuProcessHandleDumpCompleted(qemuMonitor *mon G_GNUC_UNUSED,
                                virDomainObj *vm,
                                int status,
@@ -1700,7 +1700,6 @@ qemuProcessHandleDumpCompleted(qemuMonitor *mon G_GNUC_UNUSED,
  cleanup:
     virResetLastError();
     virObjectUnlock(vm);
-    return 0;
 }


-- 
2.31.1




More information about the libvir-list mailing list