External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-04 10:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: process: Consolidate error paths in qemuProcessHandleBlockJob

Browse Source 
'cleanup' label was accessed only from a jump to 'error'. Consolidate
everyting into 'cleanup'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2018-10-17 14:22:23 +02:00
parent 89a877b312
commit 2a1248badd
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qemu/qemu_process.c
View File

@ -936,7 +936,7 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
diskAlias, vm, vm->def->name, type, status); diskAlias, vm, vm->def->name, type, status);
if (!(disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, diskAlias, NULL))) if (!(disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, diskAlias, NULL)))
goto error; goto cleanup;
job = QEMU_DOMAIN_DISK_PRIVATE(disk)->blockjob; job = QEMU_DOMAIN_DISK_PRIVATE(disk)->blockjob;
@ -950,11 +950,11 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
} else { } else {
/* there is no waiting SYNC API, dispatch the update to a thread */ /* there is no waiting SYNC API, dispatch the update to a thread */
if (VIR_ALLOC(processEvent) < 0) if (VIR_ALLOC(processEvent) < 0)
goto error; goto cleanup;
processEvent->eventType = QEMU_PROCESS_EVENT_BLOCK_JOB; processEvent->eventType = QEMU_PROCESS_EVENT_BLOCK_JOB;
if (VIR_STRDUP(data, diskAlias) < 0) if (VIR_STRDUP(data, diskAlias) < 0)
goto error; goto cleanup;
processEvent->data = data; processEvent->data = data;
processEvent->vm = virObjectRef(vm); processEvent->vm = virObjectRef(vm);
processEvent->action = type; processEvent->action = type;
@ -962,16 +962,16 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0) { if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0) {
ignore_value(virObjectUnref(vm)); ignore_value(virObjectUnref(vm));
goto error; goto cleanup;
} }
processEvent = NULL;
} }
cleanup: cleanup:
qemuProcessEventFree(processEvent);
virObjectUnlock(vm); virObjectUnlock(vm);
return 0; return 0;
error:
qemuProcessEventFree(processEvent);
goto cleanup;
} }