External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu: Use ppc64Compute() to implement ppc64DriverCompare()

Browse Source 
This ensures comparison of two CPU definitions will be consistent
regardless of the fact that it is performed using cpuCompare() or
cpuGuestData(). The x86 driver uses the same exact code.
This commit is contained in:
Andrea Bolognani 2015-08-07 17:39:11 +02:00
parent 96b2c7459c
commit d574094d30
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/cpu/cpu_ppc64.c
View File

@ -438,16 +438,22 @@ ppc64DriverCompare(virCPUDefPtr host,
virCPUDefPtr cpu, virCPUDefPtr cpu,
bool failIncompatible) bool failIncompatible)
{ {
if ((cpu->arch == VIR_ARCH_NONE || host->arch == cpu->arch) && virCPUCompareResult ret;
STREQ(host->model, cpu->model)) char *message = NULL;
return VIR_CPU_COMPARE_IDENTICAL;
if (failIncompatible) { ret = ppc64Compute(host, cpu, NULL, &message);
virReportError(VIR_ERR_CPU_INCOMPATIBLE, NULL);
return VIR_CPU_COMPARE_ERROR; if (failIncompatible && ret == VIR_CPU_COMPARE_INCOMPATIBLE) {
} else { ret = VIR_CPU_COMPARE_ERROR;
return VIR_CPU_COMPARE_INCOMPATIBLE; if (message) {
virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s", message);
} else {
virReportError(VIR_ERR_CPU_INCOMPATIBLE, NULL);
}
} }
VIR_FREE(message);
return ret;
} }
static int static int