[PATCH 10/33] qemu: Remove return value from qemuMonitorDomainIOErrorCallback
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 | 14 +++++++-------
src/qemu/qemu_process.c | 3 +--
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 260fb94696..af7fb098c6 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -183,13 +183,13 @@ typedef void (*qemuMonitorDomainWatchdogCallback)(qemuMonitor *mon,
virDomainObj *vm,
int action,
void *opaque);
-typedef int (*qemuMonitorDomainIOErrorCallback)(qemuMonitor *mon,
- virDomainObj *vm,
- const char *diskAlias,
- const char *nodename,
- int action,
- const char *reason,
- void *opaque);
+typedef void (*qemuMonitorDomainIOErrorCallback)(qemuMonitor *mon,
+ virDomainObj *vm,
+ const char *diskAlias,
+ const char *nodename,
+ int action,
+ const char *reason,
+ void *opaque);
typedef int (*qemuMonitorDomainGraphicsCallback)(qemuMonitor *mon,
virDomainObj *vm,
int phase,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 8c7e9ad3ec..6e53aec49a 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -845,7 +845,7 @@ qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUSED,
}
-static int
+static void
qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm,
const char *diskAlias,
@@ -912,7 +912,6 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
virObjectEventStateQueue(driver->domainEventState, ioErrorEvent);
virObjectEventStateQueue(driver->domainEventState, ioErrorEvent2);
virObjectEventStateQueue(driver->domainEventState, lifecycleEvent);
- return 0;
}
static int
--
2.31.1