qemu: Remove return value from qemuMonitorDomainResetCallback

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 6679d16579c4e26aaeae0a5769dc19e0b7b4b384..c94212962a457dcbec978ac53c9a5122d79f43ac 100644 (file)
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -166,9 +166,9 @@ typedef void (*qemuMonitorDomainShutdownCallback)(qemuMonitor *mon,
                                                   virDomainObj *vm,
                                                   virTristateBool guest,
                                                   void *opaque);
-typedef int (*qemuMonitorDomainResetCallback)(qemuMonitor *mon,
-                                              virDomainObj *vm,
-                                              void *opaque);
+typedef void (*qemuMonitorDomainResetCallback)(qemuMonitor *mon,
+                                               virDomainObj *vm,
+                                               void *opaque);
 typedef int (*qemuMonitorDomainStopCallback)(qemuMonitor *mon,
                                              virDomainObj *vm,
                                              void *opaque);

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index ba0f171e57171cc47945d87028e633936ca49b1e..803ca9f56375ea27557a07f80bf9c9ec498aa5a4 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -400,7 +400,7 @@ qemuProcessFindDomainDiskByAliasOrQOM(virDomainObj *vm,
 }
 
 
-static int
+static void
 qemuProcessHandleReset(qemuMonitor *mon G_GNUC_UNUSED,
                        virDomainObj *vm,
                        void *opaque)
@@ -409,7 +409,6 @@ qemuProcessHandleReset(qemuMonitor *mon G_GNUC_UNUSED,
     virObjectEvent *event;
     qemuDomainObjPrivate *priv;
     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
-    int ret = -1;
 
     virObjectLock(vm);
 
@@ -441,11 +440,9 @@ qemuProcessHandleReset(qemuMonitor *mon G_GNUC_UNUSED,
         qemuDomainObjEndJob(driver, vm);
     }
 
-    ret = 0;
  cleanup:
     virObjectUnlock(vm);
     virObjectEventStateQueue(driver->domainEventState, event);
-    return ret;
 }