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

qemu: Remove return value from qemuMonitorDomainMigrationStatusCallback

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 db67e669e2..6fef99ebac 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 154b6490ac..55998a3314 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;
 }