From bd9a14cf6e5a8431319d323131c899423d0e7c54 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 qemuMonitorDomainWatchdogCallback 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 | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 6109f0db7e..c26467cc7a 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -179,10 +179,10 @@ typedef void (*qemuMonitorDomainRTCChangeCallback)(qemuMonitor *mon, virDomainObj *vm, long long offset, void *opaque); -typedef int (*qemuMonitorDomainWatchdogCallback)(qemuMonitor *mon, - virDomainObj *vm, - int action, - void *opaque); +typedef void (*qemuMonitorDomainWatchdogCallback)(qemuMonitor *mon, + virDomainObj *vm, + int action, + void *opaque); typedef int (*qemuMonitorDomainIOErrorCallback)(qemuMonitor *mon, virDomainObj *vm, const char *diskAlias, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index da73125924..95083f3f5a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -788,7 +788,7 @@ qemuProcessHandleRTCChange(qemuMonitor *mon G_GNUC_UNUSED, } -static int +static void qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, int action, @@ -842,8 +842,6 @@ qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUSED, virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, watchdogEvent); virObjectEventStateQueue(driver->domainEventState, lifecycleEvent); - - return 0; }