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@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index c26467cc7a039b0b454be06fbf1382924d8c10ba..9874a2a4c362d120eb7b2260ab64a794090977c2 100644 (file)
--- 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 95083f3f5a43673c344706c96f48cf1f022a8752..31701d0b5dae68b483084070bb3cc725d0ef9207 100644 (file)
--- 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