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

diff --git a/RunQemu b/RunQemu
index 10776d54..87cae417 100755
--- a/RunQemu
+++ b/RunQemu
@@ -3,17 +3,14 @@
 
 QEMU=qemu-system-x86_64
 USE_GDB=
+BOOTOPT="-fda DiskImage.img -boot a"
 
-QEMU_PARAMS="-fda DiskImage.img -boot a"
+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"
 
-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
@@ -21,9 +18,28 @@ while [ $# -ne 0 ]; do
 	-gdb)
 		QEMU_PARAMS=$QEMU_PARAMS" -s -S"
 		;;
+	-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 -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"
 		;;
@@ -36,11 +52,41 @@ while [ $# -ne 0 ]; do
 		;;
 	-tuntap)
 		_NETTYPE="tap"
+		;;
+	-nousb)
+		_NOUSB="yes"
+		;;
+	-notee)
+		_NOTEE="yes"
+		;;
+	-nographic)
+		_NOGRAPHIC="yes"
+		;;
 	esac
 	shift
 done
 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
+
 #	/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
+	$QEMU $BOOTOPT $QEMU_PARAMS -nographic
+	exit
+fi
+
+if [ "x$_NOTEE" = "xyes" ] ; then
+	$QEMU $BOOTOPT $QEMU_PARAMS -serial stdio
+	exit
+fi
+
+eval $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio | tee QemuLog.txt