[kvm-unit-tests PATCH v2 2/3] arm/arm64: Use 'max' gic type

[Andrew Jones <andrew.jones@linux.dev>]

The 'max' GIC type has been supported for six years (Mar. 2018).
Ever since its introduction we've considered switching to it for the
default in the run scripts. Now, with commit 5dd20ec76ea6 ("runtime:
Update MAX_SMP probe"), we no longer always check and restrict
MAX_SMP, so we'd have better luck with configurations working by
default by finally doing the switch. Of course we also get the
benefits of testing more modern models by default and requiring less
command line modifications when converting TCG to KVM/HVF.

Signed-off-by: Andrew Jones <andrew.jones@linux.dev>
---
 arm/run | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/arm/run b/arm/run
index efdd44ce86a7..120e406fc703 100755
--- a/arm/run
+++ b/arm/run
@@ -29,13 +29,7 @@ if ! $qemu -machine '?' | grep -q 'ARM Virtual Machine'; then
 	exit 2
 fi
 
-M='-machine virt'
-
-if [ "$ACCEL" = "kvm" ]; then
-	if $qemu $M,\? | grep -q gic-version; then
-		M+=',gic-version=host'
-	fi
-fi
+M='-machine virt,gic-version=max'
 
 if [ "$ACCEL" = "kvm" ] || [ "$ACCEL" = "hvf" ]; then
 	if [ "$HOST" = "aarch64" ] || [ "$HOST" = "arm" ]; then
-- 
2.44.0