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

qemu: Remove return value from qemuMonitorDomainAcpiOstInfoCallback

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 b361d43628..da0b491a99 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -267,14 +267,14 @@ typedef void (*qemuMonitorDomainMigrationPassCallback)(qemuMonitor *mon,
                                                        int pass,
                                                        void *opaque);
 
-typedef int (*qemuMonitorDomainAcpiOstInfoCallback)(qemuMonitor *mon,
-                                                    virDomainObj *vm,
-                                                    const char *alias,
-                                                    const char *slotType,
-                                                    const char *slot,
-                                                    unsigned int source,
-                                                    unsigned int status,
-                                                    void *opaque);
+typedef void (*qemuMonitorDomainAcpiOstInfoCallback)(qemuMonitor *mon,
+                                                     virDomainObj *vm,
+                                                     const char *alias,
+                                                     const char *slotType,
+                                                     const char *slot,
+                                                     unsigned int source,
+                                                     unsigned int status,
+                                                     void *opaque);
 
 
 typedef int (*qemuMonitorDomainBlockThresholdCallback)(qemuMonitor *mon,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 3ba10bcae2..8ac564dc21 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1393,7 +1393,7 @@ qemuProcessHandleDeviceDeleted(qemuMonitor *mon G_GNUC_UNUSED,
  *  Note that qemu does not emit the event for all the documented sources or
  *  devices.
  */
-static int
+static void
 qemuProcessHandleAcpiOstInfo(qemuMonitor *mon G_GNUC_UNUSED,
                              virDomainObj *vm,
                              const char *alias,
@@ -1428,8 +1428,6 @@ qemuProcessHandleAcpiOstInfo(qemuMonitor *mon G_GNUC_UNUSED,
  cleanup:
     virObjectUnlock(vm);
     virObjectEventStateQueue(driver->domainEventState, event);
-
-    return 0;
 }