From 3af4c75d59d1f8bd7e54c06a81ab1cb089060f7f Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Tue, 5 May 2020 18:35:26 +0200 Subject: [PATCH] qemu: Don't use CPU from host capabilities as host-model on ARM MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We never supported host-model CPUs on ARM and we don't want to support them even once patches for direct detection of host CPU are merged. And since using host CPU definition for host-model CPUs exists only for backward compatibility, we should not use it for any host-model support added in the future. Such enhancement should exclusively use the result of query-cpu-model-expansion. Until proper host-model support is implemented for ARM (if ever), we need to make sure the detected host CPU is not accidentally used for host-model CPUs. Signed-off-by: Jiri Denemark Reviewed-by: Daniel P. Berrangé --- src/qemu/qemu_capabilities.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c7e58f92ae..2c6e36685e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3569,6 +3569,8 @@ virQEMUCapsInitCPUModel(virQEMUCapsPtr qemuCaps, } else if (ARCH_IS_X86(qemuCaps->arch)) { ret = virQEMUCapsInitCPUModelX86(qemuCaps, type, modelInfo, cpu, migratable); + } else if (ARCH_IS_ARM(qemuCaps->arch)) { + ret = 2; } if (ret == 0) -- 2.39.5