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

qemu: Remove return value from qemuMonitorDomainSerialChangeCallback

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 124d9719b2..284f264ef1 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 88f8a23f8c..4b6d1a7ee1 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;