[PATCH 12/33] qemu: Remove return value from qemuMonitorDomainBlockJobCallback
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 a4c82ce5d5..f2b784e4a6 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -203,13 +203,13 @@ typedef void (*qemuMonitorDomainGraphicsCallback)(qemuMonitor *mon,
const char *x509dname,
const char *saslUsername,
void *opaque);
-typedef int (*qemuMonitorDomainBlockJobCallback)(qemuMonitor *mon,
- virDomainObj *vm,
- const char *diskAlias,
- int type,
- int status,
- const char *error,
- void *opaque);
+typedef void (*qemuMonitorDomainBlockJobCallback)(qemuMonitor *mon,
+ virDomainObj *vm,
+ const char *diskAlias,
+ int type,
+ int status,
+ const char *error,
+ void *opaque);
typedef int (*qemuMonitorDomainJobStatusChangeCallback)(qemuMonitor *mon,
virDomainObj *vm,
const char *jobname,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 27ea7d8c08..abbf1776a0 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -914,7 +914,7 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
virObjectEventStateQueue(driver->domainEventState, lifecycleEvent);
}
-static int
+static void
qemuProcessHandleBlockJob(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm,
const char *diskAlias,
@@ -974,7 +974,6 @@ qemuProcessHandleBlockJob(qemuMonitor *mon G_GNUC_UNUSED,
cleanup:
qemuProcessEventFree(processEvent);
virObjectUnlock(vm);
- return 0;
}
--
2.31.1