From: Daniel Henrique Barboza <danielhb413@gmail.com>
Date: Fri, 22 May 2020 19:56:18 +0000 (-0300)
Subject: cpu_s390.c: modernize virCPUs390Update
X-Git-Tag: v6.4.0-rc1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0ba66238222c6263d01101d23adf130d63f1792;p=thirdparty%2Flibvirt.git

cpu_s390.c: modernize virCPUs390Update

Use automatic cleanup of variables.

Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <20200522195620.3843442-4-danielhb413@gmail.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/src/cpu/cpu_s390.c b/src/cpu/cpu_s390.c
index dd030c5a11..c1c5686244 100644
--- a/src/cpu/cpu_s390.c
+++ b/src/cpu/cpu_s390.c
@@ -45,8 +45,7 @@ static int
 virCPUs390Update(virCPUDefPtr guest,
                  const virCPUDef *host)
 {
-    virCPUDefPtr updated = NULL;
-    int ret = -1;
+    g_autoptr(virCPUDef) updated = NULL;
     size_t i;
 
     if (guest->mode == VIR_CPU_MODE_CUSTOM) {
@@ -58,37 +57,34 @@ virCPUs390Update(virCPUDefPtr guest,
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                            _("optional CPU features are not supported"));
         }
-        goto cleanup;
+        return -1;
     }
 
     if (!host) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("unknown host CPU model"));
-        goto cleanup;
+        return -1;
     }
 
     if (!(updated = virCPUDefCopyWithoutModel(guest)))
-        goto cleanup;
+        return -1;
 
     updated->mode = VIR_CPU_MODE_CUSTOM;
     if (virCPUDefCopyModel(updated, host, true) < 0)
-        goto cleanup;
+        return -1;
 
     for (i = 0; i < guest->nfeatures; i++) {
        if (virCPUDefUpdateFeature(updated,
                                   guest->features[i].name,
                                   guest->features[i].policy) < 0)
-           goto cleanup;
+           return -1;
     }
 
     virCPUDefStealModel(guest, updated, false);
     guest->mode = VIR_CPU_MODE_CUSTOM;
     guest->match = VIR_CPU_MATCH_EXACT;
-    ret = 0;
 
- cleanup:
-    virCPUDefFree(updated);
-    return ret;
+    return 0;
 }