NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Remove return value from qemuMonitorDomainRdmaGidStatusChangedCallback

Browse Source 
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>
This commit is contained in:
Peter Krempa 2021-07-20 10:05:06 +02:00
parent 3b63871f2c
commit 7f984ba7eb
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qemu/qemu_monitor.h
View File

@ -316,13 +316,13 @@ typedef void (*qemuMonitorDomainPRManagerStatusChangedCallback)(qemuMonitor *mon
bool connected, bool connected,
void *opaque); void *opaque);
typedef int (*qemuMonitorDomainRdmaGidStatusChangedCallback)(qemuMonitor *mon, typedef void (*qemuMonitorDomainRdmaGidStatusChangedCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,
const char *netdev, const char *netdev,
bool gid_status, bool gid_status,
unsigned long long subnet_prefix, unsigned long long subnet_prefix,
unsigned long long interface_id, unsigned long long interface_id,
void *opaque); void *opaque);
typedef int (*qemuMonitorDomainGuestCrashloadedCallback)(qemuMonitor *mon, typedef int (*qemuMonitorDomainGuestCrashloadedCallback)(qemuMonitor *mon,
virDomainObj *vm, virDomainObj *vm,

8
src/qemu/qemu_process.c
View File

@ -1751,7 +1751,7 @@ qemuProcessHandlePRManagerStatusChanged(qemuMonitor *mon G_GNUC_UNUSED,
} }
static int static void
qemuProcessHandleRdmaGidStatusChanged(qemuMonitor *mon G_GNUC_UNUSED, qemuProcessHandleRdmaGidStatusChanged(qemuMonitor *mon G_GNUC_UNUSED,
virDomainObj *vm, virDomainObj *vm,
const char *netdev, const char *netdev,
@ -1763,7 +1763,6 @@ qemuProcessHandleRdmaGidStatusChanged(qemuMonitor *mon G_GNUC_UNUSED,
virQEMUDriver *driver = opaque; virQEMUDriver *driver = opaque;
struct qemuProcessEvent *processEvent = NULL; struct qemuProcessEvent *processEvent = NULL;
qemuMonitorRdmaGidStatus *info = NULL; qemuMonitorRdmaGidStatus *info = NULL;
int ret = -1;
virObjectLock(vm); virObjectLock(vm);
@ -1787,14 +1786,9 @@ qemuProcessHandleRdmaGidStatusChanged(qemuMonitor *mon G_GNUC_UNUSED,
if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0) { if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0) {
qemuProcessEventFree(processEvent); qemuProcessEventFree(processEvent);
virObjectUnref(vm); virObjectUnref(vm);
goto cleanup;
} }
ret = 0;
cleanup:
qemuMonitorEventRdmaGidStatusFree(info);
virObjectUnlock(vm); virObjectUnlock(vm);
return ret;
} }