qemu: Remove return value from qemuMonitorDomainDeviceDeletedCallback

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 f9eba2e64765c930d68f62a6f32d962013b3137c..c867466104b42ae39e2bf94b8d08d3ff2fb2e90c 100644 (file)
--- 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 69be76ad96d56b985db5a1302ea5a2ce0861d581..4ca0ca3a102e33d3e909e9e721701e73e6673a03 100644 (file)
--- 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 d0b57350541bfd63e6df83d97550cce7b72f5c64..2bc60ce10325f8c9709f9d3ad690f2d5e76b57a1 100644 (file)
--- 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);