[PATCH 22/33] qemu: Remove return value from qemuMonitorDomainSerialChangeCallback

Peter Krempa pkrempa at redhat.com
Wed Jul 21 10:42:34 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 | 10 +++++-----
 src/qemu/qemu_process.c |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 7f6a0a71ee..0db2c69ec5 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -247,11 +247,11 @@ typedef void (*qemuMonitorDomainNicRxFilterChangedCallback)(qemuMonitor *mon,
                                                             const char *devAlias,
                                                             void *opaque);

-typedef int (*qemuMonitorDomainSerialChangeCallback)(qemuMonitor *mon,
-                                                     virDomainObj *vm,
-                                                     const char *devAlias,
-                                                     bool connected,
-                                                     void *opaque);
+typedef void (*qemuMonitorDomainSerialChangeCallback)(qemuMonitor *mon,
+                                                      virDomainObj *vm,
+                                                      const char *devAlias,
+                                                      bool connected,
+                                                      void *opaque);

 typedef int (*qemuMonitorDomainSpiceMigratedCallback)(qemuMonitor *mon,
                                                       virDomainObj *vm,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 57eca2906f..26a88069c0 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1521,7 +1521,7 @@ qemuProcessHandleNicRxFilterChanged(qemuMonitor *mon G_GNUC_UNUSED,
 }


-static int
+static void
 qemuProcessHandleSerialChanged(qemuMonitor *mon G_GNUC_UNUSED,
                                virDomainObj *vm,
                                const char *devAlias,
@@ -1552,7 +1552,7 @@ qemuProcessHandleSerialChanged(qemuMonitor *mon G_GNUC_UNUSED,

  cleanup:
     virObjectUnlock(vm);
-    return 0;
+    return;
  error:
     qemuProcessEventFree(processEvent);
     goto cleanup;
-- 
2.31.1




More information about the libvir-list mailing list