From 86a5925eddd345f5f27aed0e7fcc9c05a7e07313 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 qemuMonitorDomainPMWakeupCallback 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 | 6 +++--- src/qemu/qemu_process.c | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index a7718ebb47..94aedbe750 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -221,9 +221,9 @@ typedef void (*qemuMonitorDomainTrayChangeCallback)(qemuMonitor *mon, const char *devid, int reason, void *opaque); -typedef int (*qemuMonitorDomainPMWakeupCallback)(qemuMonitor *mon, - virDomainObj *vm, - void *opaque); +typedef void (*qemuMonitorDomainPMWakeupCallback)(qemuMonitor *mon, + virDomainObj *vm, + void *opaque); typedef int (*qemuMonitorDomainPMSuspendCallback)(qemuMonitor *mon, virDomainObj *vm, void *opaque); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 3a6c12e7a4..138a45ea10 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1125,7 +1125,7 @@ qemuProcessHandleTrayChange(qemuMonitor *mon G_GNUC_UNUSED, virObjectEventStateQueue(driver->domainEventState, event); } -static int +static void qemuProcessHandlePMWakeup(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, void *opaque) @@ -1160,7 +1160,6 @@ qemuProcessHandlePMWakeup(qemuMonitor *mon G_GNUC_UNUSED, virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); - return 0; } static int