From 4d0199663359270db1ca77daddc137a2b3092d20 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 qemuMonitorDomainBlockThresholdCallback 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 | 12 ++++++------ src/qemu/qemu_process.c | 4 +--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index da0b491a99..6806ff9552 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -277,12 +277,12 @@ typedef void (*qemuMonitorDomainAcpiOstInfoCallback)(qemuMonitor *mon, void *opaque); -typedef int (*qemuMonitorDomainBlockThresholdCallback)(qemuMonitor *mon, - virDomainObj *vm, - const char *nodename, - unsigned long long threshold, - unsigned long long excess, - void *opaque); +typedef void (*qemuMonitorDomainBlockThresholdCallback)(qemuMonitor *mon, + virDomainObj *vm, + const char *nodename, + unsigned long long threshold, + unsigned long long excess, + void *opaque); typedef enum { diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 8ac564dc21..9c7aa547b5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1431,7 +1431,7 @@ qemuProcessHandleAcpiOstInfo(qemuMonitor *mon G_GNUC_UNUSED, } -static int +static void qemuProcessHandleBlockThreshold(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *nodename, @@ -1478,8 +1478,6 @@ qemuProcessHandleBlockThreshold(qemuMonitor *mon G_GNUC_UNUSED, virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, eventDevice); virObjectEventStateQueue(driver->domainEventState, eventSource); - - return 0; }