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

Meta: Add environment variable for disabling qemu's gdb socket

Browse source 
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.
This commit is contained in:
Gal Horowitz 2021-06-29 16:10:14 +03:00 • committed by Linus Groh
parent eed6adb6fc
commit d0c7a48186
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Meta/run.sh
View file

@ -76,9 +76,13 @@ else
SERENITY_QEMU_DISPLAY_DEVICE="VGA,vgamem_mb=64 " SERENITY_QEMU_DISPLAY_DEVICE="VGA,vgamem_mb=64 "
fi 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=" [ -z "$SERENITY_COMMON_QEMU_ARGS" ] && SERENITY_COMMON_QEMU_ARGS="
$SERENITY_EXTRA_QEMU_ARGS $SERENITY_EXTRA_QEMU_ARGS
-s -m $SERENITY_RAM_SIZE -m $SERENITY_RAM_SIZE
-cpu $SERENITY_QEMU_CPU -cpu $SERENITY_QEMU_CPU
-d guest_errors -d guest_errors
-smp 2 -smp 2
@ -101,7 +105,7 @@ $SERENITY_EXTRA_QEMU_ARGS
[ -z "$SERENITY_COMMON_QEMU_Q35_ARGS" ] && SERENITY_COMMON_QEMU_Q35_ARGS=" [ -z "$SERENITY_COMMON_QEMU_Q35_ARGS" ] && SERENITY_COMMON_QEMU_Q35_ARGS="
$SERENITY_EXTRA_QEMU_ARGS $SERENITY_EXTRA_QEMU_ARGS
-s -m $SERENITY_RAM_SIZE -m $SERENITY_RAM_SIZE
-cpu $SERENITY_QEMU_CPU -cpu $SERENITY_QEMU_CPU
-machine q35 -machine q35
-d guest_errors -d guest_errors
@ -192,7 +196,7 @@ elif [ "$SERENITY_RUN" = "ci" ]; then
echo "Running QEMU in CI" echo "Running QEMU in CI"
"$SERENITY_QEMU_BIN" \ "$SERENITY_QEMU_BIN" \
$SERENITY_EXTRA_QEMU_ARGS \ $SERENITY_EXTRA_QEMU_ARGS \
-s -m $SERENITY_RAM_SIZE \ -m $SERENITY_RAM_SIZE \
-cpu $SERENITY_QEMU_CPU \ -cpu $SERENITY_QEMU_CPU \
-d guest_errors \ -d guest_errors \
-smp 2 \ -smp 2 \