qemu: Remove return value from qemuMonitorDomainShutdownCallback

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 7ee4fc31ba1238c57d3e5e5d0db415369ac2ef95..6679d16579c4e26aaeae0a5769dc19e0b7b4b384 100644 (file)
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -162,10 +162,10 @@ typedef void (*qemuMonitorDomainEventCallback)(qemuMonitor *mon,
                                                unsigned int micros,
                                                const char *details,
                                                void *opaque);
-typedef int (*qemuMonitorDomainShutdownCallback)(qemuMonitor *mon,
-                                                 virDomainObj *vm,
-                                                 virTristateBool guest,
-                                                 void *opaque);
+typedef void (*qemuMonitorDomainShutdownCallback)(qemuMonitor *mon,
+                                                  virDomainObj *vm,
+                                                  virTristateBool guest,
+                                                  void *opaque);
 typedef int (*qemuMonitorDomainResetCallback)(qemuMonitor *mon,
                                               virDomainObj *vm,
                                               void *opaque);

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index dcf74d1573b3f4a75b10a5f30aac5421dea9253c..ba0f171e57171cc47945d87028e633936ca49b1e 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -570,7 +570,7 @@ qemuProcessHandleEvent(qemuMonitor *mon G_GNUC_UNUSED,
 }
 
 
-static int
+static void
 qemuProcessHandleShutdown(qemuMonitor *mon G_GNUC_UNUSED,
                           virDomainObj *vm,
                           virTristateBool guest_initiated,
@@ -642,8 +642,6 @@ qemuProcessHandleShutdown(qemuMonitor *mon G_GNUC_UNUSED,
  unlock:
     virObjectUnlock(vm);
     virObjectEventStateQueue(driver->domainEventState, event);
-
-    return 0;
 }