From a4e654f988bbc3e952efe4c0639348158f03f593 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 20 Jul 2021 10:05:06 +0200 Subject: [PATCH] qemu: Remove return value from qemuMonitorDomainMigrationStatusCallback MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change the callback prototype and fix the callback registered in the process code. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- 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 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; }