[PATCH 26/33] 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(a)redhat.com>
---
src/qemu/qemu_monitor.h | 16 ++++++++--------
src/qemu/qemu_process.c | 4 +---
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index cbf1098fa7..c9be99e394 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 139bf7ccf1..c012e8b4de 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;
}
--
2.31.1