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

qemu: Remove return value from qemuMonitorDomainEventCallback

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 cceda229f5..7ee4fc31ba 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -155,13 +155,13 @@ typedef void (*qemuMonitorEofNotifyCallback)(qemuMonitor *mon,
 typedef void (*qemuMonitorErrorNotifyCallback)(qemuMonitor *mon,
                                                virDomainObj *vm,
                                                void *opaque);
-typedef int (*qemuMonitorDomainEventCallback)(qemuMonitor *mon,
-                                              virDomainObj *vm,
-                                              const char *event,
-                                              long long seconds,
-                                              unsigned int micros,
-                                              const char *details,
-                                              void *opaque);
+typedef void (*qemuMonitorDomainEventCallback)(qemuMonitor *mon,
+                                               virDomainObj *vm,
+                                               const char *event,
+                                               long long seconds,
+                                               unsigned int micros,
+                                               const char *details,
+                                               void *opaque);
 typedef int (*qemuMonitorDomainShutdownCallback)(qemuMonitor *mon,
                                                  virDomainObj *vm,
                                                  virTristateBool guest,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 45309ea151..dcf74d1573 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -546,7 +546,7 @@ qemuProcessShutdownOrReboot(virQEMUDriver *driver,
 }
 
 
-static int
+static void
 qemuProcessHandleEvent(qemuMonitor *mon G_GNUC_UNUSED,
                        virDomainObj *vm,
                        const char *eventName,
@@ -567,8 +567,6 @@ qemuProcessHandleEvent(qemuMonitor *mon G_GNUC_UNUSED,
 
     virObjectUnlock(vm);
     virObjectEventStateQueue(driver->domainEventState, event);
-
-    return 0;
 }