[PATCH 11/33] qemu: Remove return value from qemuMonitorDomainGraphicsCallback

Peter Krempa pkrempa at redhat.com
Wed Jul 21 10:42:23 UTC 2021


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

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 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 af7fb098c6..a4c82ce5d5 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 6e53aec49a..27ea7d8c08 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.31.1




More information about the libvir-list mailing list