1
0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00

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

This commit is contained in:
Peter Krempa 2013-10-09 14:38:11 +02:00
parent 25cbc13cd1
commit 6355e2630c

View File

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