From b2bf8d5bab52029c48959d062d6d88c241cd94a3 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 qemuMonitorDomainEventCallback 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 | 4 +--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index cceda229f5..7ee4fc31ba 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -155,13 +155,13 @@ typedef void (*qemuMonitorEofNotifyCallback)(qemuMonitor *mon, typedef void (*qemuMonitorErrorNotifyCallback)(qemuMonitor *mon, virDomainObj *vm, void *opaque); -typedef int (*qemuMonitorDomainEventCallback)(qemuMonitor *mon, - virDomainObj *vm, - const char *event, - long long seconds, - unsigned int micros, - const char *details, - void *opaque); +typedef void (*qemuMonitorDomainEventCallback)(qemuMonitor *mon, + virDomainObj *vm, + const char *event, + long long seconds, + unsigned int micros, + const char *details, + void *opaque); typedef int (*qemuMonitorDomainShutdownCallback)(qemuMonitor *mon, virDomainObj *vm, virTristateBool guest, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 45309ea151..dcf74d1573 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -546,7 +546,7 @@ qemuProcessShutdownOrReboot(virQEMUDriver *driver, } -static int +static void qemuProcessHandleEvent(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *eventName, @@ -567,8 +567,6 @@ qemuProcessHandleEvent(qemuMonitor *mon G_GNUC_UNUSED, virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - - return 0; }