From: Andrea Bolognani <abologna@redhat.com>
Date: Fri, 7 Aug 2015 15:39:04 +0000 (+0200)
Subject: cpu: Simplify ppc64ModelFromCPU()
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c238d16af4fccfb829274c1a4dbf2748d81f7714;p=libvirt.git

cpu: Simplify ppc64ModelFromCPU()
---

diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c
index 05ff8f2d94..18dbf86a09 100644
--- a/src/cpu/cpu_ppc64.c
+++ b/src/cpu/cpu_ppc64.c
@@ -163,17 +163,10 @@ ppc64ModelFromCPU(const virCPUDef *cpu,
     if (!(model = ppc64ModelFind(map, cpu->model))) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Unknown CPU model %s"), cpu->model);
-        goto error;
+        return NULL;
     }
 
-    if (!(model = ppc64ModelCopy(model)))
-        goto error;
-
-    return model;
-
- error:
-    ppc64ModelFree(model);
-    return NULL;
+    return ppc64ModelCopy(model);
 }