External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-28 03:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuMonitorOpen: Refactor cleanup

Browse Source 
Use VIR_AUTOCLOSE to avoid a 'cleanup' label.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Tim Wiederhake <twiederh@redhat.com>
This commit is contained in:
Peter Krempa 2022-02-03 13:53:20 +01:00
parent 0e01846dbf
commit 775cd951e2
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qemu/qemu_monitor.c
View File

@ -725,7 +725,7 @@ qemuMonitorOpen(virDomainObj *vm,
qemuMonitorCallbacks *cb, qemuMonitorCallbacks *cb,
void *opaque) void *opaque)
{ {
int fd = -1; VIR_AUTOCLOSE fd = -1;
qemuMonitor *ret = NULL; qemuMonitor *ret = NULL;
timeout += QEMU_DEFAULT_MONITOR_WAIT; timeout += QEMU_DEFAULT_MONITOR_WAIT;
@ -734,7 +734,7 @@ qemuMonitorOpen(virDomainObj *vm,
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unable to handle monitor type: %s"), _("unable to handle monitor type: %s"),
virDomainChrTypeToString(config->type)); virDomainChrTypeToString(config->type));
goto cleanup; return NULL;
} }
virObjectUnlock(vm); virObjectUnlock(vm);
@ -743,18 +743,16 @@ qemuMonitorOpen(virDomainObj *vm,
virObjectLock(vm); virObjectLock(vm);
if (fd < 0) if (fd < 0)
goto cleanup; return NULL;
if (!virDomainObjIsActive(vm)) { if (!virDomainObjIsActive(vm)) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s", virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("domain is not running")); _("domain is not running"));
goto cleanup; return NULL;
} }
ret = qemuMonitorOpenInternal(vm, fd, context, cb, opaque); ret = qemuMonitorOpenInternal(vm, fd, context, cb, opaque);
cleanup: fd = -1;
if (!ret)
VIR_FORCE_CLOSE(fd);
return ret; return ret;
} }