]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Remove return value from qemuMonitorDomainAcpiOstInfoCallback
authorPeter Krempa <pkrempa@redhat.com>
Tue, 20 Jul 2021 08:05:06 +0000 (10:05 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Fri, 23 Jul 2021 08:01:48 +0000 (10:01 +0200)
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>
src/qemu/qemu_monitor.h
src/qemu/qemu_process.c

index b361d43628094e5e955f3489d05688f66dd6f7bc..da0b491a99a7bf9cda80aa1872a99d7d6349ea8b 100644 (file)
@@ -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,
index 3ba10bcae230bd69e46402c6434e50d851814a98..8ac564dc216b1436994a2d5609f4f71fa9426619 100644 (file)
@@ -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;
 }