diff options
| author | kleines Filmröllchen <filmroellchen@serenityos.org> | 2022-04-05 14:54:59 +0200 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2022-04-23 13:39:13 +0200 |
| commit | 60ff054b0222b8715e5c7939fa3269bda9b255ae (patch) | |
| tree | 6dc945a1c46be16c6aa1f8fe9674a26828c2acd5 /Meta | |
| parent | 67d99f80b96bbb776d5bb5ce26c95650750d87a6 (diff) | |
| download | serenity-60ff054b0222b8715e5c7939fa3269bda9b255ae.zip | |
Meta: Rename SERENITY_KVM_SUPPORT -> SERENITY_VIRTUALIZATION_SUPPORT
Diffstat (limited to 'Meta')
| -rwxr-xr-x | Meta/run.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Meta/run.sh b/Meta/run.sh index d5697266ce..3d95b45d07 100755 --- a/Meta/run.sh +++ b/Meta/run.sh @@ -18,12 +18,12 @@ SCRIPT_DIR="$(dirname "${0}")" # FIXME: Enable for SERENITY_ARCH=aarch64 if on an aarch64 host? -# Check if SERENITY_KVM_SUPPORT is unset -if [ -z ${SERENITY_KVM_SUPPORT+x} ]; then - KVM_SUPPORT="0" - [ -e /dev/kvm ] && [ -r /dev/kvm ] && [ -w /dev/kvm ] && [ "$SERENITY_ARCH" != "aarch64" ] && [ "$(uname -m)" != "aarch64" ] && KVM_SUPPORT="1" +# Check if SERENITY_VIRTUALIZATION_SUPPORT is unset +if [ -z ${SERENITY_VIRTUALIZATION_SUPPORT+x} ]; then + VIRTUALIZATION_SUPPORT="0" + [ -e /dev/kvm ] && [ -r /dev/kvm ] && [ -w /dev/kvm ] && [ "$SERENITY_ARCH" != "aarch64" ] && [ "$(uname -m)" != "aarch64" ] && VIRTUALIZATION_SUPPORT="1" else - KVM_SUPPORT="$SERENITY_KVM_SUPPORT" + VIRTUALIZATION_SUPPORT="$SERENITY_VIRTUALIZATION_SUPPORT" fi [ -z "$SERENITY_BOCHS_BIN" ] && SERENITY_BOCHS_BIN="bochs" @@ -61,7 +61,7 @@ if [ -z "$SERENITY_QEMU_BIN" ]; then 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' ') 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." fi else @@ -122,7 +122,7 @@ if command -v wslpath >/dev/null; then case "$SERENITY_QEMU_BIN" in /mnt/?/*) 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 SERENITY_VIRT_TECH_ARG="-accel whpx,kernel-irqchip=off" else @@ -138,7 +138,7 @@ if command -v wslpath >/dev/null; then esac 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" |