[PATCH 05/33] qemu: Remove return value from qemuMonitorDomainResetCallback

[Peter Krempa]

Change the callback prototype and fix the callback registered in the
process code.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_monitor.h | 6 +++---
 src/qemu/qemu_process.c | 5 +----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 58968d940d..969bcb1454 100644
--- 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 925a774c3e..90b22167cf 100644
--- 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;
 }


-- 
2.31.1