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)
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From e980606145f5a3d8e1e669982f2e8d10bc10a77b Mon Sep 17 00:00:00 2001
|
|
From: Jiakun Shuai <shuaijiakun1288@phytium.com.cn>
|
|
Date: Mon, 29 Jul 2024 18:29:40 +0800
|
|
Subject: [PATCH] cpu: revert: Modify virCPUarmCompare to perform compare
|
|
actions
|
|
|
|
There is something wrong with the previous commit:
|
|
cpu: Modify virCPUarmCompare to perform compare actions (0acd85e553d3)
|
|
Let's revert it and push the correct version later.
|
|
|
|
Signed-off-by: Jiakun Shuai <shuaijiakun1288@phytium.com.cn>
|
|
---
|
|
src/cpu/cpu_arm.c | 4 ----
|
|
1 file changed, 4 deletions(-)
|
|
|
|
diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c
|
|
index b2b2d90a40..a0c0befaa0 100644
|
|
--- a/src/cpu/cpu_arm.c
|
|
+++ b/src/cpu/cpu_arm.c
|
|
@@ -979,10 +979,6 @@ 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
|
|
|