system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-14 20:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run: Properly use common memory size

Browse source
This commit is contained in:
Jonathan Archer 2019-11-01 17:46:39 -05:00 committed by Andreas Kling
parent cc68654a44
commit 9cad242590
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Kernel/run
View file

@ -4,6 +4,8 @@
[ -z "$SERENITY_KERNEL_CMDLINE" ] && SERENITY_KERNEL_CMDLINE="hello"
[ -z "$SERENITY_RAM_SIZE" ] && SERENITY_RAM_SIZE=128M
export SDL_VIDEO_X11_DGAMOUSE=0
if [ "$1" = "b" ]; then
@ -11,7 +13,7 @@ if [ "$1" = "b" ]; then
bochs -q -f .bochsrc
elif [ "$1" = "qn" ]; then
# ./run qn: qemu without network
$SERENITY_QEMU_BIN -s -m ${SERENITY_RAM_SIZE:-128} \
$SERENITY_QEMU_BIN -s -m $SERENITY_RAM_SIZE \
$SERENITY_EXTRA_QEMU_ARGS \
-d cpu_reset,guest_errors \
-device VGA,vgamem_mb=64 \
@ -24,7 +26,7 @@ elif [ "$1" = "qn" ]; then
-soundhw sb16
elif [ "$1" = "qtap" ]; then
# ./run qtap: qemu with tap
sudo $SERENITY_QEMU_BIN -s -m ${SERENITY_RAM_SIZE:-128} \
sudo $SERENITY_QEMU_BIN -s -m $SERENITY_RAM_SIZE \
$SERENITY_EXTRA_QEMU_ARGS \
-enable-kvm \
-d cpu_reset,guest_errors \
@ -40,7 +42,7 @@ elif [ "$1" = "qtap" ]; then
-soundhw sb16
elif [ "$1" = "qgrub" ]; then
# ./run qgrub: qemu with grub
$SERENITY_QEMU_BIN -s -m ${SERENITY_RAM_SIZE:-128} \
$SERENITY_QEMU_BIN -s -m $SERENITY_RAM_SIZE \
$SERENITY_EXTRA_QEMU_ARGS \
-enable-kvm \
-d cpu_reset,guest_errors \
@ -52,7 +54,7 @@ elif [ "$1" = "qgrub" ]; then
-hda _disk_image \
-soundhw pcspk
elif [ "$1" = "qtext" ]; then
$SERENITY_QEMU_BIN -s -m ${SERENITY_RAM_SIZE:-128} \
$SERENITY_QEMU_BIN -s -m $SERENITY_RAM_SIZE \
$SERENITY_EXTRA_QEMU_ARGS \
-d cpu_reset,guest_errors \
-device VGA,vgamem_mb=64 \
@ -65,7 +67,7 @@ elif [ "$1" = "qtext" ]; then
-soundhw sb16
else
# ./run: qemu with user networking
$SERENITY_QEMU_BIN -s -m ${SERENITY_RAM_SIZE:-128} \
$SERENITY_QEMU_BIN -s -m $SERENITY_RAM_SIZE \
$SERENITY_EXTRA_QEMU_ARGS \
-enable-kvm \
-d cpu_reset,guest_errors \