From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 9 Oct 2013 12:38:11 +0000 (+0200)
Subject: cpu: x86: Use whitespace to clarify context and use consistent labels
X-Git-Tag: CVE-2013-4401~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6355e2630c1e7a97a753488c568a96bce2cb61f7;p=thirdparty%2Flibvirt.git

cpu: x86: Use whitespace to clarify context and use consistent labels
---

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index e6ff591870..5e787fab99 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -1296,6 +1296,7 @@ x86Compute(virCPUDefPtr host,
                           "CPU vendor %s"),
                         cpu->vendor) < 0)
             goto error;
+
         return VIR_CPU_COMPARE_INCOMPATIBLE;
     }
 
@@ -1312,7 +1313,7 @@ x86Compute(virCPUDefPtr host,
     if (!x86DataIsEmpty(cpu_forbid->data)) {
         virX86CpuIncompatible(N_("Host CPU provides forbidden features"),
                               cpu_forbid->data);
-        goto out;
+        goto cleanup;
     }
 
     /* first remove features that were inherited from the CPU model and were
@@ -1327,7 +1328,7 @@ x86Compute(virCPUDefPtr host,
         virX86CpuIncompatible(N_("Host CPU does not provide required "
                                  "features"),
                               cpu_require->data);
-        goto out;
+        goto cleanup;
     }
 
     ret = VIR_CPU_COMPARE_IDENTICAL;
@@ -1349,7 +1350,7 @@ x86Compute(virCPUDefPtr host,
         virX86CpuIncompatible(N_("Host CPU does not strictly match guest CPU: "
                                  "Extra features"),
                               diff->data);
-        goto out;
+        goto cleanup;
     }
 
     if (guest != NULL) {
@@ -1374,7 +1375,7 @@ x86Compute(virCPUDefPtr host,
         }
     }
 
-out:
+cleanup:
     x86MapFree(map);
     x86ModelFree(host_model);
     x86ModelFree(diff);
@@ -1389,7 +1390,7 @@ out:
 
 error:
     ret = VIR_CPU_COMPARE_ERROR;
-    goto out;
+    goto cleanup;
 }
 #undef virX86CpuIncompatible