External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu: Modify virCPUarmCompare to perform compare actions

Browse Source 
Modify virCPUarmCompare in cpu_arm.c to perform compare action.
This patch only adds host to host CPU compare, the rest cases
remains the same. This is useful for source and destination host
compare during migrations to avoid migration between different
CPU models that have different CPU freatures.

Signed-off-by: Zhenyu Zheng <zheng.zhenyu@outlook.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Zhenyu Zheng 2020-09-24 22:12:21 +08:00 committed by Michal Privoznik
parent 95bcb97289
commit c640f382eb
1 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/cpu/cpu_arm.c
View File

@ -463,10 +463,43 @@ virCPUarmBaseline(virCPUDefPtr *cpus,
}
static virCPUCompareResult
virCPUarmCompare(virCPUDefPtr host G_GNUC_UNUSED,
virCPUDefPtr cpu G_GNUC_UNUSED,
bool failMessages G_GNUC_UNUSED)
virCPUarmCompare(virCPUDefPtr host,
virCPUDefPtr cpu,
bool failIncompatible)
{
/* Only support host to host CPU compare for ARM */
if (cpu->type != VIR_CPU_TYPE_HOST)
return VIR_CPU_COMPARE_IDENTICAL;
if (!host || !host->model) {
if (failIncompatible) {
virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s",
_("unknown host CPU"));
return VIR_CPU_COMPARE_ERROR;
}
VIR_WARN("unknown host CPU");
return VIR_CPU_COMPARE_INCOMPATIBLE;
}
/* Compare vendor and model to check if CPUs are identical */
if (STRNEQ_NULLABLE(host->vendor, cpu->vendor) ||
STRNEQ_NULLABLE(host->model, cpu->model)) {
VIR_DEBUG("Host CPU model does not match required CPU "
"vendor %s or(and) model %s",
NULLSTR(cpu->vendor), NULLSTR(cpu->model));
if (failIncompatible) {
virReportError(VIR_ERR_CPU_INCOMPATIBLE,
_("Host CPU model does not match required CPU "
"vendor %s or(and) model %s"),
NULLSTR(cpu->vendor), NULLSTR(cpu->model));
return VIR_CPU_COMPARE_ERROR;
}
return VIR_CPU_COMPARE_INCOMPATIBLE;
}
return VIR_CPU_COMPARE_IDENTICAL;
}