X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=RunQemu;h=17f7b9877864814c3ae729528ac03571439dfef2;hb=4ddb4999e2ec2de02a40085ad75f43c92a220f21;hp=74316df719a263b3d0795df92d39057aa552752f;hpb=fb3abbad5dfd71ea2b190d0b33d9c57e879fb15a;p=tpg%2Facess2.git

diff --git a/RunQemu b/RunQemu
index 74316df7..17f7b987 100755
--- a/RunQemu
+++ b/RunQemu
@@ -9,9 +9,11 @@ QEMU_PARAMS=""
 QEMU_PARAMS=$QEMU_PARAMS" -hda AcessHDD.img"
 QEMU_PARAMS=$QEMU_PARAMS" -vga std"
 QEMU_PARAMS=$QEMU_PARAMS" -smp 2"
-QEMU_PARAMS=$QEMU_PARAMS" -net nic"
 
-_NETTYPE="user"
+_NETTYPE="user,hostfwd=tcp::5555-:23"
+_NETMODEL=e1000
+
+_EVAL=eval
 
 while [ $# -ne 0 ]; do
 	case $1 in
@@ -26,13 +28,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"
 		;;
@@ -40,6 +49,9 @@ while [ $# -ne 0 ]; do
 		shift
 		QEMU_PARAMS=$QEMU_PARAMS" "$1
 		;;
+	-n)
+		_EVAL=echo
+		;;
 	-fwd)
 		_NETTYPE=$_NETTYPE",hostfwd=tcp::10023-10.0.2.10:23"
 		;;
@@ -52,24 +64,41 @@ while [ $# -ne 0 ]; do
 	-notee)
 		_NOTEE="yes"
 		;;
+	-nographic)
+		_NOGRAPHIC="yes"
+		;;
+	-netmodel)
+		shift
+		_NETMODEL=$1
+		;;
 	esac
 	shift
 done
+
+QEMU_PARAMS=$QEMU_PARAMS" -net nic,model="$_NETMODEL
 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"
 	QEMU_PARAMS=$QEMU_PARAMS" -usbdevice keyboard"
 fi
 
+if [ "x$_NOTEE" = "xyes" ] ; then
+	_TEECMD=
+else
+	_TEECMD=" | tee QemuLog.txt"
+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
-	$QEMU $BOOTOPT $QEMU_PARAMS -serial stdio
+if [ "x$_NOGRAPHIC" = "xyes" ] ; then
+	$_EVAL $QEMU $BOOTOPT $QEMU_PARAMS -nographic $_TEECMD
+	exit
 fi
+
+$_EVAL $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio $_TEECMD