Unverified Commit 1ae9bcaf authored by Kroese's avatar Kroese Committed by GitHub
Browse files

feat: Add option to disable Hyper-V (#435)

parent 43e4945f

src/config.sh

+1 −1
Original line number Diff line number Diff line
@@ -7,10 +7,10 @@ set -Eeuo pipefail 


DEF_OPTS="-nodefaults"

SERIAL_OPTS="-serial $SERIAL"

MON_OPTS="-monitor $MONITOR"

USB_OPTS="-device $USB -device usb-tablet"

RAM_OPTS=$(echo "-m $RAM_SIZE" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')

CPU_OPTS="-cpu $CPU_FLAGS -smp $CPU_CORES,sockets=1,dies=1,cores=$CPU_CORES,threads=1"

MON_OPTS="-monitor $MONITOR -name ${APP// /-},process=${APP,,// /-},debug-threads=on"

MAC_OPTS="-machine type=${MACHINE}${SECURE},graphics=off,vmport=off,dump-guest-core=off,hpet=off${KVM_OPTS}"

DEV_OPTS="-device virtio-balloon-pci,id=balloon0,bus=pcie.0,addr=0x4"

DEV_OPTS="$DEV_OPTS -object rng-random,id=objrng0,filename=/dev/urandom"

src/proc.sh

+5 −4
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ set -Eeuo pipefail 


# Docker environment variables



: "${HV="Y"}"

: "${KVM:="Y"}"

: "${CPU_FLAGS:=""}"

: "${CPU_MODEL:=""}"
@@ -38,7 +39,7 @@ fi 
if [[ "$KVM" != [Nn]* ]]; then



  CPU_FEATURES="kvm=on,l3-cache=on"

  WIN_FEATURES="+hypervisor,+invtsc,hv_passthrough"

  HV_FEATURES="+hypervisor,+invtsc,hv_passthrough"

  KVM_OPTS=",accel=kvm -enable-kvm -global kvm-pit.lost_tick_policy=discard"



  if [ -z "$CPU_MODEL" ]; then
@@ -49,7 +50,7 @@ if [[ "$KVM" != [Nn]* ]]; then 
else



  CPU_FEATURES="l3-cache=on"

  WIN_FEATURES="+hypervisor,hv_passthrough"

  HV_FEATURES="+hypervisor,hv_passthrough"



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

    KVM_OPTS=""
@@ -70,10 +71,10 @@ else 


fi



if [[ "${BOOT_MODE,,}" == "windows" ]] || [[ "${BOOT_MODE,,}" == "windows_legacy" ]]; then

if [[ "$HV" != [Nn]* ]] && [[ "${BOOT_MODE,,}" == "windows"* ]]; then



  [ -n "$CPU_FEATURES" ] && CPU_FEATURES="$CPU_FEATURES,"

  CPU_FEATURES="$CPU_FEATURES${WIN_FEATURES}"

  CPU_FEATURES="$CPU_FEATURES${HV_FEATURES}"



fi