[PATCH 14/33] qemu: Remove return value from qemuMonitorDomainTrayChangeCallback
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 | 12 ++++++------
src/qemu/qemu_process.c | 3 +--
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index e71cea797f..d080b42613 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -215,12 +215,12 @@ typedef void (*qemuMonitorDomainJobStatusChangeCallback)(qemuMonitor
*mon,
const char *jobname,
int status,
void *opaque);
-typedef int (*qemuMonitorDomainTrayChangeCallback)(qemuMonitor *mon,
- virDomainObj *vm,
- const char *devAlias,
- const char *devid,
- int reason,
- void *opaque);
+typedef void (*qemuMonitorDomainTrayChangeCallback)(qemuMonitor *mon,
+ virDomainObj *vm,
+ const char *devAlias,
+ const char *devid,
+ int reason,
+ void *opaque);
typedef int (*qemuMonitorDomainPMWakeupCallback)(qemuMonitor *mon,
virDomainObj *vm,
void *opaque);
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index cf4b0e70df..79bed57f03 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1089,7 +1089,7 @@ qemuProcessHandleGraphics(qemuMonitor *mon G_GNUC_UNUSED,
virObjectEventStateQueue(driver->domainEventState, event);
}
-static int
+static void
qemuProcessHandleTrayChange(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm,
const char *devAlias,
@@ -1123,7 +1123,6 @@ qemuProcessHandleTrayChange(qemuMonitor *mon G_GNUC_UNUSED,
virObjectUnlock(vm);
virObjectEventStateQueue(driver->domainEventState, event);
- return 0;
}
static int
--
2.31.1