From 5bc4f8dd0f90edb0d9376b04721a3aeb0bdaea51 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 qemuMonitorDomainBlockJobCallback 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 | 14 +++++++------- src/qemu/qemu_process.c | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 29823faf4c..483ad80126 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -203,13 +203,13 @@ typedef void (*qemuMonitorDomainGraphicsCallback)(qemuMonitor *mon, const char *x509dname, const char *saslUsername, void *opaque); -typedef int (*qemuMonitorDomainBlockJobCallback)(qemuMonitor *mon, - virDomainObj *vm, - const char *diskAlias, - int type, - int status, - const char *error, - void *opaque); +typedef void (*qemuMonitorDomainBlockJobCallback)(qemuMonitor *mon, + virDomainObj *vm, + const char *diskAlias, + int type, + int status, + const char *error, + void *opaque); typedef int (*qemuMonitorDomainJobStatusChangeCallback)(qemuMonitor *mon, virDomainObj *vm, const char *jobname, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 5875e8862d..25b2543968 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -914,7 +914,7 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED, virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); } -static int +static void qemuProcessHandleBlockJob(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *diskAlias, @@ -974,7 +974,6 @@ qemuProcessHandleBlockJob(qemuMonitor *mon G_GNUC_UNUSED, cleanup: qemuProcessEventFree(processEvent); virObjectUnlock(vm); - return 0; }