X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fganeti2%2Ffiles%2Fqemu-system-aarch64-wrapper;h=900d6aa64bfc23ba3d2d55bebdf14a12055e133b;hb=8c107072624a0b44645acad13d1f917580f7db2b;hp=407f87da4a716a4e64a1cc6eb910cf964707fe06;hpb=67e302d68c0e1847f62cbf778f91f00079a59297;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ganeti2/files/qemu-system-aarch64-wrapper b/modules/ganeti2/files/qemu-system-aarch64-wrapper
index 407f87da4..900d6aa64 100755
--- a/modules/ganeti2/files/qemu-system-aarch64-wrapper
+++ b/modules/ganeti2/files/qemu-system-aarch64-wrapper
@@ -11,7 +11,7 @@
 ##
 
 # Default to virt machine, forcing a gic version 3 to support more than 8 vcpus
-machine="virt,gic-version=3"
+machine="virt"
 
 # We want to always enable KVM. Contrary to what the Ganeti's documentation
 # says, enabling kvm_flag is not enough.
@@ -27,13 +27,13 @@ while [ "$1" ]; do
             fi
             shift
             ;;
-        -cpu)
+        -smp)
             # Check if the CPU is configured to run in 32-bit mode and
             # force the gvic to version 2 in that case
             args+=("$1")
             args+=("$2")
-            if echo "$2" | egrep -q '(^|,)aarch64=off(,|$)' ; then
-                machine="virt,gic-version=2"
+            if test "$2" -gt 8 ; then
+                machine="virt,gic-version=3"
             fi
             shift
             ;;