Switch nVHE tests to QEMU CPU max,sve=off
Now that we can select nVHE using a command line flag, we can ditch
the cortex-a53 workaround for selecting nVHE and use CPU max.
We still need to disable SVE as KVM will refuse to boot in nVHE if the
CPU supports it.
Test: make test, check logs that vhe/nvhe/pkvm modes are correct
Change-Id: Ifc13825e0e3abbe056064f7ccb4080ff207239f4
diff --git a/aarch64/run_qemu.sh b/aarch64/run_qemu.sh
index c886231..31e44fa 100755
--- a/aarch64/run_qemu.sh
+++ b/aarch64/run_qemu.sh
@@ -32,9 +32,9 @@
default_var KEEP_TEMP 0
default_var TIMEOUT ""
-# QEMU CPUs to use for VHE and nVHE runs
+# Default QEMU CPUs to use for VHE and nVHE runs
CPU_VHE="max"
-CPU_NVHE="cortex-a53"
+CPU_NVHE="max,sve=off" # SVE not implemented for nVHE
KiB=1024
MiB=$((1024 * KiB))
@@ -177,7 +177,9 @@
case "${MODE}" in
vhe) MODE_CPU="${CPU_VHE}";;
- nvhe) MODE_CPU="${CPU_NVHE}";;
+ nvhe) APPEND+=(kvm-arm.mode=nvhe)
+ MODE_CPU="${CPU_NVHE}"
+ ;;
pkvm) APPEND+=(kvm-arm.mode=protected)
MODE_CPU="${CPU_NVHE}"
;;
