X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=RunQemu;h=aeb68c3393931ac05ab91d4df3a424975c0158f3;hb=a9a954f29f61a1f93a9b585f69f617de2f12189f;hp=10776d54e6870bf2917175899c642a946de364be;hpb=bfacdd3b71576cf6ceaa83352d3a7d162adb75e1;p=tpg%2Facess2.git

diff --git a/RunQemu b/RunQemu
index 10776d54..aeb68c33 100755
--- a/RunQemu
+++ b/RunQemu
@@ -10,10 +10,6 @@ QEMU_PARAMS=$QEMU_PARAMS" -vga std"
 QEMU_PARAMS=$QEMU_PARAMS" -smp 2"
 QEMU_PARAMS=$QEMU_PARAMS" -net nic"
 
-QEMU_PARAMS=$QEMU_PARAMS" -usb"
-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"
 _NETTYPE="user"
 
 while [ $# -ne 0 ]; do
@@ -36,11 +32,30 @@ while [ $# -ne 0 ]; do
 		;;
 	-tuntap)
 		_NETTYPE="tap"
+		;;
+	-nousb)
+		_NOUSB="yes"
+		;;
+	-notee)
+		_NOTEE="yes"
+		;;
 	esac
 	shift
 done
 QEMU_PARAMS=$QEMU_PARAMS" -net "$_NETTYPE
 
+if [ "x$_NOUSB" != "xyes" ] ; then
+	QEMU_PARAMS=$QEMU_PARAMS" -usb"
+	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
-$QEMU $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
+fi