diff options
| author | Gal Horowitz <galush.horowitz@gmail.com> | 2021-06-29 16:10:14 +0300 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2021-06-30 18:49:04 +0100 |
| commit | d0c7a481863fd98c51591f9178843ab7cf9af819 (patch) | |
| tree | 2634872cd6331121efa88e7cc8ccad7ee84aaf8a | |
| parent | eed6adb6fcf9e30332e37030c6b783923eb7f29a (diff) | |
| download | serenity-d0c7a481863fd98c51591f9178843ab7cf9af819.zip | |
Meta: Add environment variable for disabling qemu's gdb socket
When running QEMU on windows, the `-s` does not work, and causes QEMU to
crash, you can now use the environment variable to disable that option.
| -rwxr-xr-x | Meta/run.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Meta/run.sh b/Meta/run.sh index 8f0a3fe3b0..413d262946 100755 --- a/Meta/run.sh +++ b/Meta/run.sh @@ -76,9 +76,13 @@ else SERENITY_QEMU_DISPLAY_DEVICE="VGA,vgamem_mb=64 " fi +if [ -z "$SERENITY_DISABLE_GDB_SOCKET" ]; then + SERENITY_EXTRA_QEMU_ARGS="$SERENITY_EXTRA_QEMU_ARGS -s" +fi + [ -z "$SERENITY_COMMON_QEMU_ARGS" ] && SERENITY_COMMON_QEMU_ARGS=" $SERENITY_EXTRA_QEMU_ARGS --s -m $SERENITY_RAM_SIZE +-m $SERENITY_RAM_SIZE -cpu $SERENITY_QEMU_CPU -d guest_errors -smp 2 @@ -101,7 +105,7 @@ $SERENITY_EXTRA_QEMU_ARGS [ -z "$SERENITY_COMMON_QEMU_Q35_ARGS" ] && SERENITY_COMMON_QEMU_Q35_ARGS=" $SERENITY_EXTRA_QEMU_ARGS --s -m $SERENITY_RAM_SIZE +-m $SERENITY_RAM_SIZE -cpu $SERENITY_QEMU_CPU -machine q35 -d guest_errors @@ -192,7 +196,7 @@ elif [ "$SERENITY_RUN" = "ci" ]; then echo "Running QEMU in CI" "$SERENITY_QEMU_BIN" \ $SERENITY_EXTRA_QEMU_ARGS \ - -s -m $SERENITY_RAM_SIZE \ + -m $SERENITY_RAM_SIZE \ -cpu $SERENITY_QEMU_CPU \ -d guest_errors \ -smp 2 \ |