[PATCH 20/33] qemu: Remove return value from qemuMonitorDomainDeviceDeletedCallback

[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 ++--
 src/qemu/qemu_processpriv.h | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 76e87d5909..12e90c6545 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -238,10 +238,10 @@ typedef void (*qemuMonitorDomainGuestPanicCallback)(qemuMonitor *mon,
                                                     virDomainObj *vm,
                                                     qemuMonitorEventPanicInfo *info,
                                                     void *opaque);
-typedef int (*qemuMonitorDomainDeviceDeletedCallback)(qemuMonitor *mon,
-                                                      virDomainObj *vm,
-                                                      const char *devAlias,
-                                                      void *opaque);
+typedef void (*qemuMonitorDomainDeviceDeletedCallback)(qemuMonitor *mon,
+                                                       virDomainObj *vm,
+                                                       const char *devAlias,
+                                                       void *opaque);
 typedef int (*qemuMonitorDomainNicRxFilterChangedCallback)(qemuMonitor *mon,
                                                            virDomainObj *vm,
                                                            const char *devAlias,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index cf77b7448c..a9c501e94c 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1297,7 +1297,7 @@ qemuProcessHandleGuestPanic(qemuMonitor *mon G_GNUC_UNUSED,
 }


-int
+void
 qemuProcessHandleDeviceDeleted(qemuMonitor *mon G_GNUC_UNUSED,
                                virDomainObj *vm,
                                const char *devAlias,
@@ -1330,7 +1330,7 @@ qemuProcessHandleDeviceDeleted(qemuMonitor *mon G_GNUC_UNUSED,

  cleanup:
     virObjectUnlock(vm);
-    return 0;
+    return;
  error:
     qemuProcessEventFree(processEvent);
     goto cleanup;
diff --git a/src/qemu/qemu_processpriv.h b/src/qemu/qemu_processpriv.h
index d0b5735054..2bc60ce103 100644
--- a/src/qemu/qemu_processpriv.h
+++ b/src/qemu/qemu_processpriv.h
@@ -32,9 +32,9 @@
  * This header file should never be used outside unit tests.
  */

-int qemuProcessHandleDeviceDeleted(qemuMonitor *mon,
-                                   virDomainObj *vm,
-                                   const char *devAlias,
-                                   void *opaque);
+void qemuProcessHandleDeviceDeleted(qemuMonitor *mon,
+                                    virDomainObj *vm,
+                                    const char *devAlias,
+                                    void *opaque);

 int qemuProcessQMPInitMonitor(qemuMonitor *mon);
-- 
2.31.1