From 37574d5f17d788ee42f8464f0c35db0aa2a0e2ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Mon, 23 Aug 2021 16:23:47 +0200 Subject: [PATCH] qemu: refactor virQEMUCapsInit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use g_auto and remove pointless labels. Signed-off-by: Ján Tomko Reviewed-by: Kristina Hanicova --- src/qemu/qemu_capabilities.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a80c172d71..380d0a5694 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1111,13 +1111,13 @@ virQEMUCapsProbeHostCPU(virArch hostArch, virCaps * virQEMUCapsInit(virFileCache *cache) { - virCaps *caps; + g_autoptr(virCaps) caps = NULL; size_t i; virArch hostarch = virArchFromHost(); if ((caps = virCapabilitiesNew(hostarch, true, true)) == NULL) - goto error; + return NULL; if (virCapabilitiesInitCaches(caps) < 0) VIR_WARN("Failed to get host CPU cache info"); @@ -1145,13 +1145,9 @@ virQEMUCapsInit(virFileCache *cache) if (virQEMUCapsInitGuest(caps, cache, hostarch, i) < 0) - goto error; + return NULL; - return caps; - - error: - virObjectUnref(caps); - return NULL; + return g_steal_pointer(&caps); }