X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=RunQemu;h=db5306a8cc0d6aec8375a892a435fcf89bb54cf7;hb=141a83624849c3db62522275c35c385430dfc484;hp=aeb68c3393931ac05ab91d4df3a424975c0158f3;hpb=5445411557f9e2b8e4830b333aac250bcf466621;p=tpg%2Facess2.git

diff --git a/RunQemu b/RunQemu
index aeb68c33..db5306a8 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,9 +18,28 @@ 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
 		;;
+	-bin)
+		shift
+		QEMU=$1
+		;;
+	-dbgscript)
+		QEMU="echo $QEMU"
+		;;
 	-extramem)
 		QEMU_PARAMS=$QEMU_PARAMS" -m 768"
 		;;
@@ -39,6 +59,9 @@ while [ $# -ne 0 ]; do
 	-notee)
 		_NOTEE="yes"
 		;;
+	-nographic)
+		_NOGRAPHIC="yes"
+		;;
 	esac
 	shift
 done
@@ -46,6 +69,7 @@ QEMU_PARAMS=$QEMU_PARAMS" -net "$_NETTYPE
 
 if [ "x$_NOUSB" != "xyes" ] ; then
 	QEMU_PARAMS=$QEMU_PARAMS" -usb"
+	QEMU_PARAMS=$QEMU_PARAMS" -device usb-ehci"
 	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"
@@ -54,8 +78,15 @@ 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
-if [ "x$_NOTEE" != "xyes" ] ; then
-	$QEMU $QEMU_PARAMS -serial stdio | tee QemuLog.txt
-else
-	$QEMU $QEMU_PARAMS -serial stdio
+#echo $QEMU $BOOTOPT $QEMU_PARAMS
+if [ "x$_NOGRAPHIC" = "xyes" ] ; then
+	eval $QEMU $BOOTOPT $QEMU_PARAMS -nographic | tee QemuLog.txt
+	exit
 fi
+
+if [ "x$_NOTEE" = "xyes" ] ; then
+	eval $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio
+	exit
+fi
+
+eval $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio | tee QemuLog.txt