From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 20 Jul 2021 08:05:06 +0000 (+0200)
Subject: qemu: Remove return value from qemuMonitorDomainDumpCompletedCallback
X-Git-Tag: v7.6.0-rc1~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a55093ec280183ee9066a3640df4ee4cb7f6c396;p=thirdparty%2Flibvirt.git

qemu: Remove return value from qemuMonitorDomainDumpCompletedCallback

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 6806ff9552..1de39e81eb 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 9c7aa547b5..7e4a025e35 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;
 }