From: Ján Tomko <jtomko@redhat.com>
Date: Fri, 20 Aug 2021 11:35:05 +0000 (+0200)
Subject: tests: use g_auto in qemuTestParseCapabilitiesArch
X-Git-Tag: v7.7.0-rc1~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0447e6243b4c24ce20f5b40e081a23ad81416e5b;p=thirdparty%2Flibvirt.git

tests: use g_auto in qemuTestParseCapabilitiesArch

Refactor qemuTestParseCapabilitiesArch to use g_auto for cleanup.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Kristina Hanicova <khanicov@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 81d4a44f9a..ea9a283297 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -304,19 +304,15 @@ virQEMUCaps *
 qemuTestParseCapabilitiesArch(virArch arch,
                               const char *capsFile)
 {
-    virQEMUCaps *qemuCaps = NULL;
+    g_autoptr(virQEMUCaps) qemuCaps = NULL;
     g_autofree char *binary = g_strdup_printf("/usr/bin/qemu-system-%s",
                                               virArchToString(arch));
 
     if (!(qemuCaps = virQEMUCapsNewBinary(binary)) ||
         virQEMUCapsLoadCache(arch, qemuCaps, capsFile, true) < 0)
-        goto error;
-
-    return qemuCaps;
+        return NULL;
 
- error:
-    virObjectUnref(qemuCaps);
-    return NULL;
+    return g_steal_pointer(&qemuCaps);
 }