qemu: Remove return value from qemuMonitorDomainRdmaGidStatusChangedCallback

Change the callback prototype and fix the callback registered in the
process code.

It is also impossible for @info to be non-NULL in the cleanup section so
the cleanup can be completely removed.

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 45396c790853a661681cf571801f8141339da020..74a3a4e787ede499f33a6e48f061ea8c5a638733 100644 (file)
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -316,13 +316,13 @@ typedef void (*qemuMonitorDomainPRManagerStatusChangedCallback)(qemuMonitor *mon
                                                                 bool connected,
                                                                 void *opaque);
 
-typedef int (*qemuMonitorDomainRdmaGidStatusChangedCallback)(qemuMonitor *mon,
-                                                             virDomainObj *vm,
-                                                             const char *netdev,
-                                                             bool gid_status,
-                                                             unsigned long long subnet_prefix,
-                                                             unsigned long long interface_id,
-                                                             void *opaque);
+typedef void (*qemuMonitorDomainRdmaGidStatusChangedCallback)(qemuMonitor *mon,
+                                                              virDomainObj *vm,
+                                                              const char *netdev,
+                                                              bool gid_status,
+                                                              unsigned long long subnet_prefix,
+                                                              unsigned long long interface_id,
+                                                              void *opaque);
 
 typedef int (*qemuMonitorDomainGuestCrashloadedCallback)(qemuMonitor *mon,
                                                          virDomainObj *vm,

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index af6355c653efb1584672a8437162a20943eb9d22..264ba9252acaaba192a92aa0027ad47736d9f390 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -1751,7 +1751,7 @@ qemuProcessHandlePRManagerStatusChanged(qemuMonitor *mon G_GNUC_UNUSED,
 }
 
 
-static int
+static void
 qemuProcessHandleRdmaGidStatusChanged(qemuMonitor *mon G_GNUC_UNUSED,
                                       virDomainObj *vm,
                                       const char *netdev,
@@ -1763,7 +1763,6 @@ qemuProcessHandleRdmaGidStatusChanged(qemuMonitor *mon G_GNUC_UNUSED,
     virQEMUDriver *driver = opaque;
     struct qemuProcessEvent *processEvent = NULL;
     qemuMonitorRdmaGidStatus *info = NULL;
-    int ret = -1;
 
     virObjectLock(vm);
 
@@ -1787,14 +1786,9 @@ qemuProcessHandleRdmaGidStatusChanged(qemuMonitor *mon G_GNUC_UNUSED,
     if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0) {
         qemuProcessEventFree(processEvent);
         virObjectUnref(vm);
-        goto cleanup;
     }
 
-    ret = 0;
- cleanup:
-    qemuMonitorEventRdmaGidStatusFree(info);
     virObjectUnlock(vm);
-    return ret;
 }