From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 20 Jul 2021 08:05:06 +0000 (+0200)
Subject: qemu: Remove return value from qemuMonitorDomainGraphicsCallback
X-Git-Tag: v7.6.0-rc1~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0487ba754240b4bb2844416696bfe3da66fa74f;p=thirdparty%2Flibvirt.git

qemu: Remove return value from qemuMonitorDomainGraphicsCallback

Change the callback prototype and fix the callback registered in the
process code.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

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