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

Meta: Rename SERENITY_KVM_SUPPORT -> SERENITY_VIRTUALIZATION_SUPPORT

Browse source
This commit is contained in:
kleines Filmröllchen 2022-04-05 14:54:59 +02:00 • committed by Linus Groh
parent 67d99f80b9
commit 60ff054b02
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Meta/run.sh
View file

@ -18,12 +18,12 @@ SCRIPT_DIR="$(dirname "${0}")"
# FIXME: Enable for SERENITY_ARCH=aarch64 if on an aarch64 host? # FIXME: Enable for SERENITY_ARCH=aarch64 if on an aarch64 host?
# Check if SERENITY_KVM_SUPPORT is unset # Check if SERENITY_VIRTUALIZATION_SUPPORT is unset
if [ -z ${SERENITY_KVM_SUPPORT+x} ]; then if [ -z ${SERENITY_VIRTUALIZATION_SUPPORT+x} ]; then
KVM_SUPPORT="0" VIRTUALIZATION_SUPPORT="0"
[ -e /dev/kvm ] && [ -r /dev/kvm ] && [ -w /dev/kvm ] && [ "$SERENITY_ARCH" != "aarch64" ] && [ "$(uname -m)" != "aarch64" ] && KVM_SUPPORT="1" [ -e /dev/kvm ] && [ -r /dev/kvm ] && [ -w /dev/kvm ] && [ "$SERENITY_ARCH" != "aarch64" ] && [ "$(uname -m)" != "aarch64" ] && VIRTUALIZATION_SUPPORT="1"
else else
KVM_SUPPORT="$SERENITY_KVM_SUPPORT" VIRTUALIZATION_SUPPORT="$SERENITY_VIRTUALIZATION_SUPPORT"
fi fi
[ -z "$SERENITY_BOCHS_BIN" ] && SERENITY_BOCHS_BIN="bochs" [ -z "$SERENITY_BOCHS_BIN" ] && SERENITY_BOCHS_BIN="bochs"
@ -61,7 +61,7 @@ if [ -z "$SERENITY_QEMU_BIN" ]; then
PATH=$PATH:/mnt/c/Windows/System32 PATH=$PATH:/mnt/c/Windows/System32
QEMU_INSTALL_DIR=$(reg.exe query 'HKLM\Software\QEMU' /v Install_Dir /t REG_SZ | grep '^ Install_Dir' | sed 's/ / /g' | cut -f4- -d' ') QEMU_INSTALL_DIR=$(reg.exe query 'HKLM\Software\QEMU' /v Install_Dir /t REG_SZ | grep '^ Install_Dir' | sed 's/ / /g' | cut -f4- -d' ')
if [ -z "$QEMU_INSTALL_DIR" ]; then if [ -z "$QEMU_INSTALL_DIR" ]; then
if [ "$KVM_SUPPORT" -eq "0" ]; then if [ "$VIRTUALIZATION_SUPPORT" -eq "0" ]; 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
@ -122,7 +122,7 @@ 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 [ "$KVM_SUPPORT" -eq "1" ]; then if [ "$VIRTUALIZATION_SUPPORT" -eq "1" ]; then
if [ "$installed_major_version" -gt 5 ]; then if [ "$installed_major_version" -gt 5 ]; then
SERENITY_VIRT_TECH_ARG="-accel whpx,kernel-irqchip=off" SERENITY_VIRT_TECH_ARG="-accel whpx,kernel-irqchip=off"
else else
@ -138,7 +138,7 @@ 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" [ "$VIRTUALIZATION_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"