cpu: Make comparing PowerPC CPUs easier to read

Revert the condition to make it easier to read. The function is also
renamed as ppcCompare to match other functions in PowerPC CPU driver.
This commit is contained in:
Jiri Denemark 2012-12-18 23:32:01 +01:00
parent 16c6b60cbd
commit 6af5a06275

View File

@ -414,15 +414,14 @@ no_memory:
} }
static virCPUCompareResult static virCPUCompareResult
PowerPCCompare(virCPUDefPtr host, ppcCompare(virCPUDefPtr host,
virCPUDefPtr cpu) virCPUDefPtr cpu)
{ {
if ((cpu->arch != VIR_ARCH_NONE && if ((cpu->arch == VIR_ARCH_NONE || host->arch == cpu->arch) &&
(host->arch != cpu->arch)) || STREQ(host->model, cpu->model))
STRNEQ(host->model, cpu->model))
return VIR_CPU_COMPARE_INCOMPATIBLE;
return VIR_CPU_COMPARE_IDENTICAL; return VIR_CPU_COMPARE_IDENTICAL;
return VIR_CPU_COMPARE_INCOMPATIBLE;
} }
static int static int
@ -631,7 +630,7 @@ struct cpuArchDriver cpuDriverPowerPC = {
.name = "ppc64", .name = "ppc64",
.arch = archs, .arch = archs,
.narch = ARRAY_CARDINALITY(archs), .narch = ARRAY_CARDINALITY(archs),
.compare = PowerPCCompare, .compare = ppcCompare,
.decode = PowerPCDecode, .decode = PowerPCDecode,
.encode = NULL, .encode = NULL,
.free = PowerPCDataFree, .free = PowerPCDataFree,