qemu: Remove return value from qemuMonitorDomainTrayChangeCallback

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 5f25d821f648c78ecd5969bd07a43fb72be97b86..a7718ebb474aa8df23ef7f8f25701cd571c8d1c0 100644 (file)
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -215,12 +215,12 @@ typedef void (*qemuMonitorDomainJobStatusChangeCallback)(qemuMonitor *mon,
                                                          const char *jobname,
                                                          int status,
                                                          void *opaque);
-typedef int (*qemuMonitorDomainTrayChangeCallback)(qemuMonitor *mon,
-                                                   virDomainObj *vm,
-                                                   const char *devAlias,
-                                                   const char *devid,
-                                                   int reason,
-                                                   void *opaque);
+typedef void (*qemuMonitorDomainTrayChangeCallback)(qemuMonitor *mon,
+                                                    virDomainObj *vm,
+                                                    const char *devAlias,
+                                                    const char *devid,
+                                                    int reason,
+                                                    void *opaque);
 typedef int (*qemuMonitorDomainPMWakeupCallback)(qemuMonitor *mon,
                                                  virDomainObj *vm,
                                                  void *opaque);

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 83260c902eb3a84f93abf0756f0dda0fb5431972..3a6c12e7a41039353448fa781121a35761d84aaa 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1089,7 +1089,7 @@ qemuProcessHandleGraphics(qemuMonitor *mon G_GNUC_UNUSED,
     virObjectEventStateQueue(driver->domainEventState, event);
 }
 
-static int
+static void
 qemuProcessHandleTrayChange(qemuMonitor *mon G_GNUC_UNUSED,
                             virDomainObj *vm,
                             const char *devAlias,
@@ -1123,7 +1123,6 @@ qemuProcessHandleTrayChange(qemuMonitor *mon G_GNUC_UNUSED,
 
     virObjectUnlock(vm);
     virObjectEventStateQueue(driver->domainEventState, event);
-    return 0;
 }
 
 static int