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_capabilities.c: modernize virQEMUCapsCacheLookupDefault

Browse Source 
Use g_autoptr() in qemuCaps to get rid of a virObjectUnref call,
a 'cleanup' label and the 'ret' pointer.

Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Daniel Henrique Barboza 2020-06-22 10:32:33 -03:00 committed by Ján Tomko
parent c508c94d57
commit 461ddf509c
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/qemu/qemu_capabilities.c
View File

@ -5737,8 +5737,7 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache,
virArch hostarch = virArchFromHost(); virArch hostarch = virArchFromHost();
virArch arch = hostarch; virArch arch = hostarch;
virDomainVirtType capsType; virDomainVirtType capsType;
virQEMUCapsPtr qemuCaps = NULL; g_autoptr(virQEMUCaps) qemuCaps = NULL;
virQEMUCapsPtr ret = NULL;
virArch arch_from_caps; virArch arch_from_caps;
g_autofree char *probedbinary = NULL; g_autofree char *probedbinary = NULL;
@ -5746,14 +5745,14 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache,
(virttype = virDomainVirtTypeFromString(virttypeStr)) < 0) { (virttype = virDomainVirtTypeFromString(virttypeStr)) < 0) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("unknown virttype: %s"), virttypeStr); _("unknown virttype: %s"), virttypeStr);
goto cleanup; return NULL;
} }
if (archStr && if (archStr &&
(arch = virArchFromString(archStr)) == VIR_ARCH_NONE) { (arch = virArchFromString(archStr)) == VIR_ARCH_NONE) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("unknown architecture: %s"), archStr); _("unknown architecture: %s"), archStr);
goto cleanup; return NULL;
} }
if (!binary) { if (!binary) {
@ -5762,7 +5761,7 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache,
} }
if (!(qemuCaps = virQEMUCapsCacheLookup(cache, binary))) if (!(qemuCaps = virQEMUCapsCacheLookup(cache, binary)))
goto cleanup; return NULL;
arch_from_caps = virQEMUCapsGetArch(qemuCaps); arch_from_caps = virQEMUCapsGetArch(qemuCaps);
@ -5776,7 +5775,7 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache,
"match given architecture '%s'"), "match given architecture '%s'"),
virArchToString(arch_from_caps), virArchToString(arch_from_caps),
virArchToString(arch)); virArchToString(arch));
goto cleanup; return NULL;
} }
capsType = virQEMUCapsGetVirtType(qemuCaps); capsType = virQEMUCapsGetVirtType(qemuCaps);
@ -5788,7 +5787,7 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache,
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("KVM is not supported by '%s' on this host"), _("KVM is not supported by '%s' on this host"),
binary); binary);
goto cleanup; return NULL;
} }
if (machine) { if (machine) {
@ -5799,7 +5798,7 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache,
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("the machine '%s' is not supported by emulator '%s'"), _("the machine '%s' is not supported by emulator '%s'"),
machine, binary); machine, binary);
goto cleanup; return NULL;
} }
} else { } else {
machine = virQEMUCapsGetPreferredMachine(qemuCaps, virttype); machine = virQEMUCapsGetPreferredMachine(qemuCaps, virttype);
@ -5812,11 +5811,7 @@ virQEMUCapsCacheLookupDefault(virFileCachePtr cache,
if (retMachine) if (retMachine)
*retMachine = machine; *retMachine = machine;
ret = g_steal_pointer(&qemuCaps); return g_steal_pointer(&qemuCaps);
cleanup:
virObjectUnref(qemuCaps);
return ret;
} }
bool bool