X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=RunQemu;h=1202613f7ed1ec99ca592dfd7ae2b842b78dae22;hb=3c283c4831c40c14d308a54cefb997832a860bca;hp=bb94daf6eca424569acf2c6e2a15b22362c6ef66;hpb=cbad8d25ce1ad97678fb444668dc46974c872c58;p=tpg%2Facess2.git

diff --git a/RunQemu b/RunQemu
index bb94daf6..1202613f 100755
--- a/RunQemu
+++ b/RunQemu
@@ -3,22 +3,50 @@
 
 QEMU=qemu-system-x86_64
 USE_GDB=
+BOOTOPT="-fda DiskImage.img -boot a"
 
-QEMU_PARAMS="-fda DiskImage.img -boot a"
-QEMU_PARAMS=$QEMU_PARAMS" -hdb AcessHDD.img"
+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"
+MODS=""
+
+_NETTYPE="user,hostfwd=tcp::5555-:23"
+_NETMODEL=e1000
+
+_EVAL=eval
 
 while [ $# -ne 0 ]; do
 	case $1 in
 	-gdb)
 		QEMU_PARAMS=$QEMU_PARAMS" -s -S"
 		;;
+	-mod)
+		shift
+		MODS=$MODS","$1
+		;;
+	-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$MODS -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"
 		;;
@@ -26,13 +54,65 @@ while [ $# -ne 0 ]; do
 		shift
 		QEMU_PARAMS=$QEMU_PARAMS" "$1
 		;;
+	-n)
+		_EVAL=echo
+		;;
+	-fwd)
+		_NETTYPE=$_NETTYPE",hostfwd=tcp::10023-10.0.2.10:23"
+		;;
 	-tuntap)
 		_NETTYPE="tap"
+		;;
+	-nousb)
+		_NOUSB="yes"
+		;;
+	-notee)
+		_NOTEE="yes"
+		;;
+	-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"
+		;;
+	-sata)
+		QEMU_PARAMS=$QEMU_PARAMS" -device ich9-ahci,id=ahci"
+		QEMU_PARAMS=$QEMU_PARAMS" -drive if=none,id=sata_disk,file=HDD_sata.img"
+		QEMU_PARAMS=$QEMU_PARAMS" -device ide-drive,drive=sata_disk,bus=ahci.0"
+		;;
 	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
-$QEMU $QEMU_PARAMS -serial stdio | tee QemuLog.txt
+#echo $QEMU $BOOTOPT $QEMU_PARAMS
+if [ "x$_NOGRAPHIC" = "xyes" ] ; then
+	$_EVAL $QEMU $BOOTOPT $QEMU_PARAMS -nographic $_TEECMD
+	exit
+fi
+
+$_EVAL $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio $_TEECMD