Merge branch 'master' of git://localhost/acess2

[tpg/acess2.git] / RunQemu

diff --git a/RunQemu b/RunQemu
index 2b7bc9d..74316df 100755 (executable)
--- a/RunQemu
+++ b/RunQemu
@@ -3,8 +3,9 @@
 
 QEMU=qemu-system-x86_64
 USE_GDB=
+BOOTOPT="-fda DiskImage.img -boot a"
 
-QEMU_PARAMS="-fda DiskImage.img -boot a"
+QEMU_PARAMS=""
 QEMU_PARAMS=$QEMU_PARAMS" -hda AcessHDD.img"
 QEMU_PARAMS=$QEMU_PARAMS" -vga std"
 QEMU_PARAMS=$QEMU_PARAMS" -smp 2"
@@ -17,6 +18,18 @@ while [ $# -ne 0 ]; do
        -gdb)
                QEMU_PARAMS=$QEMU_PARAMS" -s -S"
                ;;
+       -dbin)
+               shift
+               if [ "x$2" = "xdefault" ] || [ "x$2" = "x" ]; then
+                       _kfile="KernelLand/Acess2.$1.bin"
+               else
+                       _kfile="KernelLand/Acess2.$1-$2.bin"
+               fi
+               BOOTOPT="-kernel $_kfile"
+               BOOTOPT=$BOOTOPT" -initrd KernelLand/Modules/Filesystems/FS_InitRD.kmd.$1 -append $3"
+               shift
+               shift
+               ;;
        -dbgbin)
                QEMU=/home/tpg/apps/bin/qemu-system-x86_64
                ;;
@@ -49,12 +62,14 @@ if [ "x$_NOUSB" != "xyes" ] ; then
        QEMU_PARAMS=$QEMU_PARAMS" -drive id=test_usb_image,file=USB_Test_Image.img,if=none"
        QEMU_PARAMS=$QEMU_PARAMS" -device usb-storage,drive=test_usb_image"
        QEMU_PARAMS=$QEMU_PARAMS" -usbdevice mouse"
+       QEMU_PARAMS=$QEMU_PARAMS" -usbdevice keyboard"
 fi
 
 #      /home/tpg/apps/bin/qemu-system-x86_64 $QEMU_PARAMS -serial stdio -serial file:QemuLog.txt
 #      qemu-system-x86_64 $QEMU_PARAMS -serial stdio | tee QemuLog.txt
+#echo $QEMU $BOOTOPT $QEMU_PARAMS
 if [ "x$_NOTEE" != "xyes" ] ; then
-       $QEMU $QEMU_PARAMS -serial stdio | tee QemuLog.txt
+       $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio | tee QemuLog.txt
 else
-       $QEMU $QEMU_PARAMS -serial stdio
+       $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio
 fi