From 96d98a4b194777507e015a01d0a042c7491febd8 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 qemuMonitorDomainIOErrorCallback 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 c26467cc7a..9874a2a4c3 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -183,13 +183,13 @@ typedef void (*qemuMonitorDomainWatchdogCallback)(qemuMonitor *mon, virDomainObj *vm, int action, void *opaque); -typedef int (*qemuMonitorDomainIOErrorCallback)(qemuMonitor *mon, - virDomainObj *vm, - const char *diskAlias, - const char *nodename, - int action, - const char *reason, - void *opaque); +typedef void (*qemuMonitorDomainIOErrorCallback)(qemuMonitor *mon, + virDomainObj *vm, + const char *diskAlias, + const char *nodename, + int action, + const char *reason, + void *opaque); typedef int (*qemuMonitorDomainGraphicsCallback)(qemuMonitor *mon, virDomainObj *vm, int phase, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 95083f3f5a..31701d0b5d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -845,7 +845,7 @@ qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUSED, } -static int +static void qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *diskAlias, @@ -912,7 +912,6 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED, virObjectEventStateQueue(driver->domainEventState, ioErrorEvent); virObjectEventStateQueue(driver->domainEventState, ioErrorEvent2); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); - return 0; } static int