qemu: Remove return value from qemuMonitorDomainWatchdogCallback

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 6109f0db7ead2ac439ab79eb34666298b80cf202..c26467cc7a039b0b454be06fbf1382924d8c10ba 100644 (file)
--- 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 da73125924b3811061800d069f17d9ffa2fb0388..95083f3f5a43673c344706c96f48cf1f022a8752 100644 (file)
--- 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;
 }