From 8c107072624a0b44645acad13d1f917580f7db2b Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Thu, 13 Jun 2019 12:54:59 +0200 Subject: [PATCH] qemu-system-aarch64-wrapper: only enable gic version 3 with more than 8 vcpus as gic version 3 is not supported on conova-node01/02 --- modules/ganeti2/files/qemu-system-aarch64-wrapper | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 ;; -- 2.20.1