3794a89ceb
- virt-host-validate: Fix IOMMU output on aarch64 - cpu: revert: Modify virCPUarmCompare to perform compare actions - cpu: Modify virCPUarmCompare to perform compare actions - add phytium s5000c support on arm architecture for capability Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit 44c38ffc1edcbe107228e1bfb254fbccee15d88c)
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
From 0acd85e553d371b86b5c387f23301947329fdcf3 Mon Sep 17 00:00:00 2001
|
|
From: Zhenyu Zheng <zheng.zhenyu@outlook.com>
|
|
Date: Thu, 24 Sep 2020 22:12:21 +0800
|
|
Subject: [PATCH] cpu: Modify virCPUarmCompare to perform compare actions
|
|
|
|
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.
|
|
|
|
-------------------------------------------------------------
|
|
|
|
This patch only adds host to host CPU compare, the rest cases
|
|
remains the same.
|
|
|
|
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>
|
|
Signed-off-by: pengmengguang <pengmengguang@phytium.com.cn>
|
|
Conflicts:
|
|
[pengmengguang: adjust content]
|
|
Signed-off-by: Jiakun Shuai <shuaijiakun1288@phytium.com.cn>
|
|
---
|
|
src/cpu/cpu_arm.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c
|
|
index a0c0befaa0..b2b2d90a40 100644
|
|
--- a/src/cpu/cpu_arm.c
|
|
+++ b/src/cpu/cpu_arm.c
|
|
@@ -979,6 +979,10 @@ virCPUarmCompare(virCPUDefPtr host,
|
|
virCPUCompareResult ret = VIR_CPU_COMPARE_ERROR;
|
|
g_autofree char *message = NULL;
|
|
|
|
+ /* 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 (failMessages) {
|
|
virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s",
|
|
--
|
|
2.41.0.windows.1
|
|
|