X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=RunQemu;h=d2e9ec37c74da73f8f5dc162db59ea6cd90e57d8;hb=e0415fca385926b5e1bddcd4f8936ef49b9b4177;hp=67f91450843aa2b8d223d8a75b3794e2cc854a18;hpb=6ffe630a29490fbe79cc46d934650168af44ca10;p=tpg%2Facess2.git

diff --git a/RunQemu b/RunQemu
index 67f91450..d2e9ec37 100755
--- a/RunQemu
+++ b/RunQemu
@@ -26,13 +26,20 @@ while [ $# -ne 0 ]; do
 			_kfile="KernelLand/Acess2.$1-$2.bin"
 		fi
 		BOOTOPT="-kernel $_kfile"
-		BOOTOPT=$BOOTOPT" -initrd KernelLand/Modules/Filesystems/FS_InitRD.kmd.$1 -append '$3'"
+		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"
 		;;
@@ -52,6 +59,9 @@ while [ $# -ne 0 ]; do
 	-notee)
 		_NOTEE="yes"
 		;;
+	-nographic)
+		_NOGRAPHIC="yes"
+		;;
 	esac
 	shift
 done
@@ -59,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"
@@ -68,8 +79,14 @@ 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 $BOOTOPT $QEMU_PARAMS -serial stdio | tee QemuLog.txt
-else
+if [ "x$_NOGRAPHIC" = "xyes" ] ; then
+	$QEMU $BOOTOPT $QEMU_PARAMS -nographic
+	exit
+fi
+
+if [ "x$_NOTEE" = "xyes" ] ; then
 	$QEMU $BOOTOPT $QEMU_PARAMS -serial stdio
+	exit
 fi
+
+$QEMU $BOOTOPT $QEMU_PARAMS -serial stdio | tee QemuLog.txt