|
 |
43fe83 |
From 19b983fe7b1037f18ab291d655b01adc5986b642 Mon Sep 17 00:00:00 2001
|
|
|
43fe83 |
Message-Id: <19b983fe7b1037f18ab291d655b01adc5986b642.1383922566.git.jdenemar@redhat.com>
|
|
|
43fe83 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
43fe83 |
Date: Fri, 8 Nov 2013 12:33:26 +0100
|
|
|
43fe83 |
Subject: [PATCH] cpu: x86: Use whitespace to clarify context and use
|
|
|
43fe83 |
consistent labels
|
|
|
43fe83 |
|
|
|
43fe83 |
https://bugzilla.redhat.com/show_bug.cgi?id=1008989
|
|
|
43fe83 |
|
|
|
43fe83 |
(cherry picked from commit 6355e2630c1e7a97a753488c568a96bce2cb61f7)
|
|
|
43fe83 |
|
|
|
43fe83 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
43fe83 |
---
|
|
|
43fe83 |
src/cpu/cpu_x86.c | 11 ++++++-----
|
|
|
43fe83 |
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
|
43fe83 |
|
|
|
43fe83 |
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
|
|
|
43fe83 |
index 6c599f8..610f028 100644
|
|
|
43fe83 |
--- a/src/cpu/cpu_x86.c
|
|
|
43fe83 |
+++ b/src/cpu/cpu_x86.c
|
|
|
43fe83 |
@@ -1295,6 +1295,7 @@ x86Compute(virCPUDefPtr host,
|
|
|
43fe83 |
"CPU vendor %s"),
|
|
|
43fe83 |
cpu->vendor) < 0)
|
|
|
43fe83 |
goto error;
|
|
|
43fe83 |
+
|
|
|
43fe83 |
return VIR_CPU_COMPARE_INCOMPATIBLE;
|
|
|
43fe83 |
}
|
|
|
43fe83 |
|
|
|
43fe83 |
@@ -1311,7 +1312,7 @@ x86Compute(virCPUDefPtr host,
|
|
|
43fe83 |
if (!x86DataIsEmpty(cpu_forbid->data)) {
|
|
|
43fe83 |
virX86CpuIncompatible(N_("Host CPU provides forbidden features"),
|
|
|
43fe83 |
cpu_forbid->data);
|
|
|
43fe83 |
- goto out;
|
|
|
43fe83 |
+ goto cleanup;
|
|
|
43fe83 |
}
|
|
|
43fe83 |
|
|
|
43fe83 |
/* first remove features that were inherited from the CPU model and were
|
|
|
43fe83 |
@@ -1326,7 +1327,7 @@ x86Compute(virCPUDefPtr host,
|
|
|
43fe83 |
virX86CpuIncompatible(N_("Host CPU does not provide required "
|
|
|
43fe83 |
"features"),
|
|
|
43fe83 |
cpu_require->data);
|
|
|
43fe83 |
- goto out;
|
|
|
43fe83 |
+ goto cleanup;
|
|
|
43fe83 |
}
|
|
|
43fe83 |
|
|
|
43fe83 |
ret = VIR_CPU_COMPARE_IDENTICAL;
|
|
|
43fe83 |
@@ -1348,7 +1349,7 @@ x86Compute(virCPUDefPtr host,
|
|
|
43fe83 |
virX86CpuIncompatible(N_("Host CPU does not strictly match guest CPU: "
|
|
|
43fe83 |
"Extra features"),
|
|
|
43fe83 |
diff->data);
|
|
|
43fe83 |
- goto out;
|
|
|
43fe83 |
+ goto cleanup;
|
|
|
43fe83 |
}
|
|
|
43fe83 |
|
|
|
43fe83 |
if (guest != NULL) {
|
|
|
43fe83 |
@@ -1373,7 +1374,7 @@ x86Compute(virCPUDefPtr host,
|
|
|
43fe83 |
}
|
|
|
43fe83 |
}
|
|
|
43fe83 |
|
|
|
43fe83 |
-out:
|
|
|
43fe83 |
+cleanup:
|
|
|
43fe83 |
x86MapFree(map);
|
|
|
43fe83 |
x86ModelFree(host_model);
|
|
|
43fe83 |
x86ModelFree(diff);
|
|
|
43fe83 |
@@ -1388,7 +1389,7 @@ out:
|
|
|
43fe83 |
|
|
|
43fe83 |
error:
|
|
|
43fe83 |
ret = VIR_CPU_COMPARE_ERROR;
|
|
|
43fe83 |
- goto out;
|
|
|
43fe83 |
+ goto cleanup;
|
|
|
43fe83 |
}
|
|
|
43fe83 |
#undef virX86CpuIncompatible
|
|
|
43fe83 |
|
|
|
43fe83 |
--
|
|
|
43fe83 |
1.8.4.2
|
|
|
43fe83 |
|