diff options
| author | Andrew Kaster <akaster@serenityos.org> | 2022-10-02 13:30:40 -0600 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2022-10-03 09:57:45 +0100 |
| commit | 376425639d032b29a42ca5354eb11a08ce8b991b (patch) | |
| tree | fbaa187672022776c339577d484fb0307debca2b | |
| parent | 9f7a68136f8d0bbe46b51c2838ae5f6170058724 (diff) | |
| download | serenity-376425639d032b29a42ca5354eb11a08ce8b991b.zip | |
Meta: Force -machine pc-i440fx-7.0 when using QEMU >= 7.1
Until the root cause behind #14952 is found, this workaround should stem
the tide of users in discord asking why their system crashes on startup.
| -rwxr-xr-x | Meta/run.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Meta/run.sh b/Meta/run.sh index 4f49a778cd..d8bb860f5b 100755 --- a/Meta/run.sh +++ b/Meta/run.sh @@ -121,6 +121,11 @@ 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 @@ -256,6 +261,7 @@ 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 |