From b0487ba754240b4bb2844416696bfe3da66fa74f 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 qemuMonitorDomainGraphicsCallback MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 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 | 26 +++++++++++++------------- src/qemu/qemu_process.c | 4 +--- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 9874a2a4c3..29823faf4c 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -190,19 +190,19 @@ typedef void (*qemuMonitorDomainIOErrorCallback)(qemuMonitor *mon, int action, const char *reason, void *opaque); -typedef int (*qemuMonitorDomainGraphicsCallback)(qemuMonitor *mon, - virDomainObj *vm, - int phase, - int localFamily, - const char *localNode, - const char *localService, - int remoteFamily, - const char *remoteNode, - const char *remoteService, - const char *authScheme, - const char *x509dname, - const char *saslUsername, - void *opaque); +typedef void (*qemuMonitorDomainGraphicsCallback)(qemuMonitor *mon, + virDomainObj *vm, + int phase, + int localFamily, + const char *localNode, + const char *localService, + int remoteFamily, + const char *remoteNode, + const char *remoteService, + const char *authScheme, + const char *x509dname, + const char *saslUsername, + void *opaque); typedef int (*qemuMonitorDomainBlockJobCallback)(qemuMonitor *mon, virDomainObj *vm, const char *diskAlias, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 31701d0b5d..5875e8862d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1039,7 +1039,7 @@ qemuProcessHandleJobStatusChange(qemuMonitor *mon G_GNUC_UNUSED, } -static int +static void qemuProcessHandleGraphics(qemuMonitor *mon G_GNUC_UNUSED, virDomainObj *vm, int phase, @@ -1089,8 +1089,6 @@ qemuProcessHandleGraphics(qemuMonitor *mon G_GNUC_UNUSED, virObjectUnlock(vm); virObjectEventStateQueue(driver->domainEventState, event); - - return 0; } static int -- 2.47.2