From cce3c6584cabb481d9ae45b7f61a0509d57df639 Mon Sep 17 00:00:00 2001 From: Kroese Date: Sun, 4 Feb 2024 14:26:06 +0100 Subject: [PATCH] Update proc.sh --- src/proc.sh | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/src/proc.sh b/src/proc.sh index bd48bd4..3e495e5 100644 --- a/src/proc.sh +++ b/src/proc.sh @@ -5,8 +5,7 @@ set -Eeuo pipefail : "${KVM:="Y"}" : "${CPU_FLAGS:=""}" -: "${CPU_MODEL:="host"}" -: "${MODEL:="cortex-a53"}" +: "${CPU_MODEL:="cortex-a53"}" [[ "$ARCH" != "arm"* ]] && KVM="N" @@ -33,6 +32,7 @@ fi if [[ "$KVM" != [Nn]* ]]; then + CPU_MODEL="host" KVM_OPTS=",accel=kvm -enable-kvm" CPU_FEATURES="kvm=on,l3-cache=on,migratable=no" WIN_FEATURES="+hypervisor,+invtsc,hv_passthrough" @@ -45,19 +45,15 @@ else MACHINE="$MACHINE,virtualization=on" fi - if [[ "${CPU_MODEL,,}" == "host"* ]]; then - - if [[ "$ARCH" != "arm"* ]]; then - CPU_MODEL="$MODEL" - CPU_FEATURES="l3-cache=on" - WIN_FEATURES="+hypervisor,hv_passthrough" - else - CPU_MODEL="max" - CPU_FEATURES="l3-cache=on,migratable=no" - WIN_FEATURES="+hypervisor,hv_passthrough" - fi - + if [[ "$ARCH" != "arm"* ]]; then + CPU_FEATURES="l3-cache=on" + else + CPU_MODEL="max" + CPU_FEATURES="l3-cache=on,migratable=no" fi + + WIN_FEATURES="+hypervisor,hv_passthrough" + fi if [[ "${BOOT_MODE,,}" == "windows" ]]; then