@samitouri / QOSamiQemu / commits / d0dce802c9

target/arm: Use -cpu max-v8 with aarch64=off

Armv9 does not support privileged aarch32 execution, so aarch64 cannot be disabled. These tests must use Armv8. Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20260827041557.775080-6-richard.henderson@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Richard Henderson committed Aug 26, 2026 at 21:15 UTC d0dce802c9488e015acfc4e6092eb7413d6bdaac
2 files changed +4 -4
tests/functional/aarch64/test_virt_aarch64_off.py
+2 -2
@@ -18,9 +18,9 @@ class ArmVirtMachine(LinuxKernelTest):
18 def test_arm_virt(self):
19 self.set_machine('virt')
20 # KVM aarch64=off requires a host CPU that supports it, so
21 - # restrict the test to TCG only
21 + # restrict the test to TCG ARMv8.
22 self.require_accelerator('tcg')
23 - self.vm.add_args('-cpu', 'max,aarch64=off')
23 + self.vm.add_args('-cpu', 'max-v8,aarch64=off')
24
25 kernel_path = self.ASSET_KERNEL.fetch()
26
tests/qtest/arm-cpu-features.c
+2 -2
@@ -493,8 +493,8 @@ static void test_query_cpu_model_expansion(const void *data)
493 sve_tests_default(qts, "max");
494 pauth_tests_default(qts, "max");
495
496 - /* TCG allows us to turn off AArch64 on the 'max' CPU type */
497 - assert_set_feature(qts, "max", "aarch64", false);
496 + /* TCG allows us to turn off AArch64 on the 'max-v8' CPU type */
497 + assert_set_feature(qts, "max-v8", "aarch64", false);
498 }
499
500 qtest_quit(qts);