From 1e6875a732d896138d3bc2351e5284d1ad13dd59 Mon Sep 17 00:00:00 2001
From: Xu Yandong <xuyandong2@huawei.com>
Date: Wed, 20 May 2020 02:33:27 -0400
Subject: [PATCH] cpu/aarch64: enable host-model cpu for AArch64 architecture

The 'host-model' cpu is support by kunpeng-v virtualization
suit, skip hypervisor host-model externsion checking on AArch64
architecture.

Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
---
 src/qemu/qemu_command.c  | 2 +-
 tests/qemuxml2argvtest.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 2f0e919..2f65b8d 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6582,7 +6582,7 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver,
         break;
     }
 
-    if ((ARCH_IS_S390(def->os.arch) || ARCH_IS_ARM(def->os.arch)) &&
+    if (ARCH_IS_S390(def->os.arch) &&
         cpu->features &&
         !virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 596dd7a..2153e44 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2736,8 +2736,6 @@ mymain(void)
     DO_TEST("aarch64-noacpi-nouefi", NONE);
     DO_TEST_PARSE_ERROR("aarch64-acpi-nouefi", NONE);
 
-    /* QEMU 4.0.0 didn't have support for aarch64 CPU features */
-    DO_TEST_CAPS_ARCH_VER_FAILURE("aarch64-features-sve", "aarch64", "4.0.0");
     /* aarch64 doesn't support the same CPU features as x86 */
     DO_TEST_CAPS_ARCH_LATEST_FAILURE("aarch64-features-wrong", "aarch64");
     /* Can't enable vector lengths when SVE is overall disabled */
-- 
1.8.3.1