From 19b983fe7b1037f18ab291d655b01adc5986b642 Mon Sep 17 00:00:00 2001 Message-Id: <19b983fe7b1037f18ab291d655b01adc5986b642.1383922566.git.jdenemar@redhat.com> From: Peter Krempa Date: Fri, 8 Nov 2013 12:33:26 +0100 Subject: [PATCH] cpu: x86: Use whitespace to clarify context and use consistent labels https://bugzilla.redhat.com/show_bug.cgi?id=1008989 (cherry picked from commit 6355e2630c1e7a97a753488c568a96bce2cb61f7) Signed-off-by: Jiri Denemark --- src/cpu/cpu_x86.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 6c599f8..610f028 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -1295,6 +1295,7 @@ x86Compute(virCPUDefPtr host, "CPU vendor %s"), cpu->vendor) < 0) goto error; + return VIR_CPU_COMPARE_INCOMPATIBLE; } @@ -1311,7 +1312,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 @@ -1326,7 +1327,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; @@ -1348,7 +1349,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) { @@ -1373,7 +1374,7 @@ x86Compute(virCPUDefPtr host, } } -out: +cleanup: x86MapFree(map); x86ModelFree(host_model); x86ModelFree(diff); @@ -1388,7 +1389,7 @@ out: error: ret = VIR_CPU_COMPARE_ERROR; - goto out; + goto cleanup; } #undef virX86CpuIncompatible -- 1.8.4.2