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

run: Make it easy to override which qemu executable is used.

Browse source 
Patch contributed by "pd"
This commit is contained in:
Andreas Kling 2019-05-04 02:51:50 +02:00
parent 7aba0058ae
commit f137881147
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Kernel/run
View file

@ -1,5 +1,7 @@
#!/bin/sh #!/bin/sh
[ -z "$SERENITY_QEMU_BIN" ] && SERENITY_QEMU_BIN="qemu-system-i386"
export SDL_VIDEO_X11_DGAMOUSE=0 export SDL_VIDEO_X11_DGAMOUSE=0
ram_size=128 ram_size=128
@ -8,14 +10,14 @@ if [ "$1" = "b" ]; then
bochs -q -f .bochsrc bochs -q -f .bochsrc
elif [ "$1" = "qn" ]; then elif [ "$1" = "qn" ]; then
# ./run qn: qemu without network # ./run qn: qemu without network
qemu-system-i386 -s -m $ram_size \ $SERENITY_QEMU_BIN -s -m $ram_size \
$SERENITY_EXTRA_QEMU_ARGS \ $SERENITY_EXTRA_QEMU_ARGS \
-device e1000 \ -device e1000 \
-kernel kernel \ -kernel kernel \
-hda _fs_contents -hda _fs_contents
elif [ "$1" = "qtap" ]; then elif [ "$1" = "qtap" ]; then
# ./run qtap: qemu with tap # ./run qtap: qemu with tap
sudo qemu-system-i386 -s -m $ram_size \ sudo $SERENITY_QEMU_BIN -s -m $ram_size \
$SERENITY_EXTRA_QEMU_ARGS \ $SERENITY_EXTRA_QEMU_ARGS \
-object filter-dump,id=hue,netdev=br0,file=e1000.pcap \ -object filter-dump,id=hue,netdev=br0,file=e1000.pcap \
-netdev tap,ifname=tap0,id=br0 \ -netdev tap,ifname=tap0,id=br0 \
@ -24,7 +26,7 @@ elif [ "$1" = "qtap" ]; then
-hda _fs_contents -hda _fs_contents
else else
# ./run: qemu with user networking # ./run: qemu with user networking
qemu-system-i386 -s -m $ram_size \ $SERENITY_QEMU_BIN -s -m $ram_size \
$SERENITY_EXTRA_QEMU_ARGS \ $SERENITY_EXTRA_QEMU_ARGS \
-object filter-dump,id=hue,netdev=breh,file=e1000.pcap \ -object filter-dump,id=hue,netdev=breh,file=e1000.pcap \
-netdev user,id=breh,hostfwd=tcp:127.0.0.1:8888-192.168.5.2:8888 \ -netdev user,id=breh,hostfwd=tcp:127.0.0.1:8888-192.168.5.2:8888 \