RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 10:57:35 +00:00
Code Issues Activity Actions

Meta: Use SERENITY_KVM_SUPPORT to also toggle virtualization on Windows

Browse source 
It's sometimes nice to turn off virtualization, even on Windows :^)
This commit is contained in:
kleines Filmröllchen 2022-04-05 14:47:10 +02:00 • committed by Linus Groh
parent 70a55ccf73
commit 67d99f80b9
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Meta/run.sh
View file

@ -65,7 +65,6 @@ if [ -z "$SERENITY_QEMU_BIN" ]; then
die "Could not determine where QEMU for Windows is installed. Please make sure QEMU is installed or set SERENITY_QEMU_BIN if it is already installed." die "Could not determine where QEMU for Windows is installed. Please make sure QEMU is installed or set SERENITY_QEMU_BIN if it is already installed."
fi fi
else else
KVM_SUPPORT="0"
QEMU_BINARY_PREFIX="$(wslpath -- "${QEMU_INSTALL_DIR}" | tr -d '\r\n')/" QEMU_BINARY_PREFIX="$(wslpath -- "${QEMU_INSTALL_DIR}" | tr -d '\r\n')/"
QEMU_BINARY_SUFFIX=".exe" QEMU_BINARY_SUFFIX=".exe"
fi fi
@ -79,7 +78,6 @@ if [ -z "$SERENITY_QEMU_BIN" ]; then
fi fi
fi fi
[ "$KVM_SUPPORT" -eq "1" ] && SERENITY_VIRT_TECH_ARG="-enable-kvm"
# For default values, see Kernel/CommandLine.cpp # For default values, see Kernel/CommandLine.cpp
[ -z "$SERENITY_KERNEL_CMDLINE" ] && SERENITY_KERNEL_CMDLINE="hello" [ -z "$SERENITY_KERNEL_CMDLINE" ] && SERENITY_KERNEL_CMDLINE="hello"
@ -124,11 +122,14 @@ if command -v wslpath >/dev/null; then
case "$SERENITY_QEMU_BIN" in case "$SERENITY_QEMU_BIN" in
/mnt/?/*) /mnt/?/*)
if [ -z "$SERENITY_VIRT_TECH_ARG" ]; then if [ -z "$SERENITY_VIRT_TECH_ARG" ]; then
if [ "$installed_major_version" -gt 5 ]; then if [ "$KVM_SUPPORT" -eq "1" ]; then
SERENITY_VIRT_TECH_ARG="-accel whpx,kernel-irqchip=off -accel tcg" if [ "$installed_major_version" -gt 5 ]; then
else SERENITY_VIRT_TECH_ARG="-accel whpx,kernel-irqchip=off"
SERENITY_VIRT_TECH_ARG="-accel whpx -accel tcg" else
SERENITY_VIRT_TECH_ARG="-accel whpx"
fi
fi fi
SERENITY_VIRT_TECH_ARG="$SERENITY_VIRT_TECH_ARG -accel tcg"
fi fi
[ -z "$SERENITY_QEMU_CPU" ] && SERENITY_QEMU_CPU="max,vmx=off" [ -z "$SERENITY_QEMU_CPU" ] && SERENITY_QEMU_CPU="max,vmx=off"
SERENITY_KERNEL_CMDLINE="$SERENITY_KERNEL_CMDLINE disable_virtio" SERENITY_KERNEL_CMDLINE="$SERENITY_KERNEL_CMDLINE disable_virtio"
@ -137,6 +138,8 @@ if command -v wslpath >/dev/null; then
esac esac
fi fi
[ "$KVM_SUPPORT" -eq "1" ] && [ "$NATIVE_WINDOWS_QEMU" -ne "1" ] && SERENITY_VIRT_TECH_ARG="-enable-kvm"
[ -z "$SERENITY_QEMU_CPU" ] && SERENITY_QEMU_CPU="max" [ -z "$SERENITY_QEMU_CPU" ] && SERENITY_QEMU_CPU="max"
if [ "$SERENITY_ARCH" != "aarch64" ]; then if [ "$SERENITY_ARCH" != "aarch64" ]; then