]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: refactor virQEMUCapsLoadFile
authorJán Tomko <jtomko@redhat.com>
Mon, 23 Aug 2021 14:22:17 +0000 (16:22 +0200)
committerJán Tomko <jtomko@redhat.com>
Mon, 23 Aug 2021 15:35:06 +0000 (17:35 +0200)
Use g_auto and remove pointless labels.

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

index 174352a5a237b5395387cc19db84ce171b89a2af..a80c172d71cdffa605b100e23c1258b857916dc1 100644 (file)
@@ -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);
 }