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

Kernel: Ignore an invalid QEMU multiboot entry

Browse source 
This was introduced in the QEMU commit 8504f12 and was causing the
kernel to fail to boot on the q35 machine.

Fixes #14952.
This commit is contained in:
implicitfield 2022-12-06 23:47:45 +02:00 • committed by Linus Groh
parent 733a318709
commit 9665f41979
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Meta/run.sh
View file

@ -121,11 +121,6 @@ if [ "$installed_major_version" -lt "$SERENITY_QEMU_MIN_REQ_MAJOR_VERSION" ] ||
die
fi
# https://github.com/SerenityOS/serenity/issues/14952
if [ "$installed_major_version" -ge 7 ] && [ "$installed_minor_version" -gt 0 ]; then
SERENITY_MACHINE_FORCE_VERSION_SEVEN_ZERO="-machine pc-i440fx-7.0"
fi
NATIVE_WINDOWS_QEMU="0"
if command -v wslpath >/dev/null; then
@ -267,7 +262,6 @@ if [ -z "$SERENITY_MACHINE" ]; then
SERENITY_MACHINE="-M raspi3b -serial stdio"
else
SERENITY_MACHINE="
$SERENITY_MACHINE_FORCE_VERSION_SEVEN_ZERO
-m $SERENITY_RAM_SIZE
-smp $SERENITY_CPUS
-display $SERENITY_QEMU_DISPLAY_BACKEND