X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=RunQemu;h=e69a55ee9b796956ff2da5d806a6a7d0bdcd1b25;hb=c01cd6b0f42fa4cd400c5d9493c8b7ec92e72c5b;hp=68f6efc843606e071db651b3f083a6fdd5a586bc;hpb=4c78a1bdd506cda6cda27ee342165c7dfa7ecdc2;p=tpg%2Facess2.git

diff --git a/RunQemu b/RunQemu
index 68f6efc8..e69a55ee 100755
--- a/RunQemu
+++ b/RunQemu
@@ -9,10 +9,10 @@ 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,model=e1000"
-#QEMU_PARAMS=$QEMU_PARAMS" -net nic,model=rtl8139"
+MODS=""
 
 _NETTYPE="user,hostfwd=tcp::5555-:23"
+_NETMODEL=e1000
 
 _EVAL=eval
 
@@ -21,6 +21,10 @@ while [ $# -ne 0 ]; do
 	-gdb)
 		QEMU_PARAMS=$QEMU_PARAMS" -s -S"
 		;;
+	-mod)
+		shift
+		MODS=$MODS","$1
+		;;
 	-dbin)
 		shift
 		if [ "x$2" = "xdefault" ] || [ "x$2" = "x" ]; then
@@ -29,7 +33,7 @@ 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$MODS -append \"$3\""
 		shift
 		shift
 		;;
@@ -68,9 +72,19 @@ while [ $# -ne 0 ]; do
 	-nographic)
 		_NOGRAPHIC="yes"
 		;;
+	-netmodel)
+		shift
+		_NETMODEL=$1
+		;;
+	-pciserial)
+		QEMU_PARAMS=$QEMU_PARAMS" -device pci-serial,chardev=serial2"
+		QEMU_PARAMS=$QEMU_PARAMS" -chardev socket,id=serial2,host=localhost,port=10023,server,telnet"
+		;;
 	esac
 	shift
 done
+
+QEMU_PARAMS=$QEMU_PARAMS" -net nic,model="$_NETMODEL
 QEMU_PARAMS=$QEMU_PARAMS" -net "$_NETTYPE
 
 if [ "x$_NOUSB" != "xyes" ] ; then
@@ -79,20 +93,21 @@ 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"
+#	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$_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
+	$_EVAL $QEMU $BOOTOPT $QEMU_PARAMS -nographic $_TEECMD
 	exit
 fi
 
-$_EVAL $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio | tee QemuLog.txt
+$_EVAL $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio $_TEECMD