From: Ján Tomko <jtomko@redhat.com>
Date: Mon, 23 Aug 2021 14:22:17 +0000 (+0200)
Subject: qemu: refactor virQEMUCapsLoadFile
X-Git-Tag: v7.7.0-rc1~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9d6ffacd182ea580b482b252351c2fe55b5e922;p=thirdparty%2Flibvirt.git

qemu: refactor virQEMUCapsLoadFile

Use g_auto and remove pointless labels.

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

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 174352a5a2..a80c172d71 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5510,7 +5510,7 @@ virQEMUCapsLoadFile(const char *filename,
                     void *privData,
                     bool *outdated)
 {
-    virQEMUCaps *qemuCaps = virQEMUCapsNewBinary(binary);
+    g_autoptr(virQEMUCaps) qemuCaps = virQEMUCapsNewBinary(binary);
     virQEMUCapsCachePriv *priv = privData;
     int ret;
 
@@ -5519,17 +5519,13 @@ virQEMUCapsLoadFile(const char *filename,
 
     ret = virQEMUCapsLoadCache(priv->hostArch, qemuCaps, filename, false);
     if (ret < 0)
-        goto error;
+        return NULL;
     if (ret == 1) {
         *outdated = true;
-        goto error;
+        return NULL;
     }
 
-    return qemuCaps;
-
- error:
-    virObjectUnref(qemuCaps);
-    return NULL;
+    return g_steal_pointer(&qemuCaps);
 }