qemu: Remove return value from qemuMonitorDomainBlockThresholdCallback

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 da0b491a99a7bf9cda80aa1872a99d7d6349ea8b..6806ff95525b2a7ef7f95dd7d0dabef6fa40b009 100644 (file)
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -277,12 +277,12 @@ typedef void (*qemuMonitorDomainAcpiOstInfoCallback)(qemuMonitor *mon,
                                                      void *opaque);
 
 
-typedef int (*qemuMonitorDomainBlockThresholdCallback)(qemuMonitor *mon,
-                                                       virDomainObj *vm,
-                                                       const char *nodename,
-                                                       unsigned long long threshold,
-                                                       unsigned long long excess,
-                                                       void *opaque);
+typedef void (*qemuMonitorDomainBlockThresholdCallback)(qemuMonitor *mon,
+                                                        virDomainObj *vm,
+                                                        const char *nodename,
+                                                        unsigned long long threshold,
+                                                        unsigned long long excess,
+                                                        void *opaque);
 
 
 typedef enum {

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 8ac564dc216b1436994a2d5609f4f71fa9426619..9c7aa547b564a64223d6a1b0714fb5b75a8a15de 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1431,7 +1431,7 @@ qemuProcessHandleAcpiOstInfo(qemuMonitor *mon G_GNUC_UNUSED,
 }
 
 
-static int
+static void
 qemuProcessHandleBlockThreshold(qemuMonitor *mon G_GNUC_UNUSED,
                                 virDomainObj *vm,
                                 const char *nodename,
@@ -1478,8 +1478,6 @@ qemuProcessHandleBlockThreshold(qemuMonitor *mon G_GNUC_UNUSED,
     virObjectUnlock(vm);
     virObjectEventStateQueue(driver->domainEventState, eventDevice);
     virObjectEventStateQueue(driver->domainEventState, eventSource);
-
-    return 0;
 }