X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=RunQemu;h=74316df719a263b3d0795df92d39057aa552752f;hb=7a078d8b7b68b15587560dba5da46d5afa7768d9;hp=2b7bc9dc87c7929e45641e449a26c36125679425;hpb=696914a56e084ab4ba50f8ce6b891e606dbbd8e5;p=tpg%2Facess2.git

diff --git a/RunQemu b/RunQemu
index 2b7bc9dc..74316df7 100755
--- 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