From f4b36cd87c4194f6fa53e0c9430f074ee363b181 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 qemuMonitorDomainTrayChangeCallback 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 | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 5f25d821f6..a7718ebb47 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -215,12 +215,12 @@ typedef void (*qemuMonitorDomainJobStatusChangeCallback)(qemuMonitor *mon, const char *jobname, int status, void *opaque); -typedef int (*qemuMonitorDomainTrayChangeCallback)(qemuMonitor *mon, - virDomainObj *vm, - const char *devAlias, - const char *devid, - int reason, - void *opaque); +typedef void (*qemuMonitorDomainTrayChangeCallback)(qemuMonitor *mon, + virDomainObj *vm, + const char *devAlias, + const char *devid, + int reason, + void *opaque); typedef int (*qemuMonitorDomainPMWakeupCallback)(qemuMonitor *mon, virDomainObj *vm, void *opaque); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 83260c902e..3a6c12e7a4 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1089,7 +1089,7 @@ qemuProcessHandleGraphics(qemuMonitor *mon G_GNUC_UNUSED, virObjectEventStateQueue(driver->domainEventState, event); } -static int +static void qemuProcessHandleTrayChange(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, const char *devAlias, @@ -1123,7 +1123,6 @@ qemuProcessHandleTrayChange(qemuMonitor *mon G_GNUC_UNUSED, virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - return 0; } static int