[PATCH 09/33] qemu: Remove return value from qemuMonitorDomainWatchdogCallback

[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 | 8 ++++----
 src/qemu/qemu_process.c | 4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index a085e7ea27..260fb94696 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -179,10 +179,10 @@ typedef void (*qemuMonitorDomainRTCChangeCallback)(qemuMonitor *mon,
                                                    virDomainObj *vm,
                                                    long long offset,
                                                    void *opaque);
-typedef int (*qemuMonitorDomainWatchdogCallback)(qemuMonitor *mon,
-                                                 virDomainObj *vm,
-                                                 int action,
-                                                 void *opaque);
+typedef void (*qemuMonitorDomainWatchdogCallback)(qemuMonitor *mon,
+                                                  virDomainObj *vm,
+                                                  int action,
+                                                  void *opaque);
 typedef int (*qemuMonitorDomainIOErrorCallback)(qemuMonitor *mon,
                                                 virDomainObj *vm,
                                                 const char *diskAlias,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index e41e350f33..8c7e9ad3ec 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -788,7 +788,7 @@ qemuProcessHandleRTCChange(qemuMonitor *mon G_GNUC_UNUSED,
 }


-static int
+static void
 qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUSED,
                           virDomainObj *vm,
                           int action,
@@ -842,8 +842,6 @@ qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUSED,
     virObjectUnlock(vm);
     virObjectEventStateQueue(driver->domainEventState, watchdogEvent);
     virObjectEventStateQueue(driver->domainEventState, lifecycleEvent);
-
-    return 0;
 }


-- 
2.31.1