From: Tim Wiederhake <twiederh@redhat.com>
Date: Wed, 9 Sep 2020 06:37:51 +0000 (+0200)
Subject: cpu_ppc64: Remove error path in virCPUppc64DriverGetModels
X-Git-Tag: v6.8.0-rc1~236
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b261edd15472557170bb032b7dfd4358084f3a4;p=thirdparty%2Flibvirt.git

cpu_ppc64: Remove error path in virCPUppc64DriverGetModels

The call to `g_strfreev` is not required, as in both cases no memory has been allocated.

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c
index 9e6f1e856e..28fbfea9ae 100644
--- a/src/cpu/cpu_ppc64.c
+++ b/src/cpu/cpu_ppc64.c
@@ -738,24 +738,17 @@ virCPUppc64DriverGetModels(char ***models)
     size_t i;
 
     if (!(map = ppc64LoadMap()))
-        goto error;
+        return -1;
 
     if (models) {
         if (VIR_ALLOC_N(*models, map->nmodels + 1) < 0)
-            goto error;
+            return -1;
 
         for (i = 0; i < map->nmodels; i++)
             (*models)[i] = g_strdup(map->models[i]->name);
     }
 
     return map->nmodels;
-
- error:
-    if (models) {
-        g_strfreev(*models);
-        *models = NULL;
-    }
-    return -1;
 }
 
 struct cpuArchDriver cpuDriverPPC64 = {