Unverified Commit 19be1155 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

fix: Use Skylake CPU model for Windows when KVM is disabled (#842)

parent 99c867ca

src/proc.sh

+9 −6
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ set -Eeuo pipefail 
: "${VMX:="N"}"

: "${CPU_FLAGS:=""}"

: "${CPU_MODEL:=""}"

: "${DEF_MODEL:="qemu64"}"



if [[ "${ARCH,,}" != "amd64" ]]; then

  KVM="N"
@@ -138,14 +137,18 @@ else 


  if [ -z "$CPU_MODEL" ]; then

    if [[ "$ARCH" == "amd64" ]]; then

     if [[ "${BOOT_MODE,,}" != "windows"* ]]

       CPU_MODEL="max"

       CPU_FEATURES+=",migratable=no"

     else

      CPU_MODEL="$DEF_MODEL"

       CPU_MODEL="Skylake-Client-v4"

       CPU_FEATURES+=",-pcid,-tsc-deadline,-invpcid,-spec-ctrl,-xsavec,-xsaves,check"

     fi

    else

      CPU_MODEL="qemu64"

      CPU_FEATURES+=",+aes,+popcnt,+pni,+sse4.1,+sse4.2,+ssse3,+avx,+avx2,+bmi1,+bmi2,+f16c,+fma,+abm,+movbe,+xsave"

    fi

  fi



  CPU_FEATURES+=",+ssse3,+sse4.1,+sse4.2"



fi