X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=RunQemu;h=1202613f7ed1ec99ca592dfd7ae2b842b78dae22;hb=98bd9c0c8985c50c42231c116a4e18fedd47761e;hp=17f7b9877864814c3ae729528ac03571439dfef2;hpb=124d6aa373a7094e486522b6862bcb8ed0b5493e;p=tpg%2Facess2.git

diff --git a/RunQemu b/RunQemu
index 17f7b987..1202613f 100755
--- a/RunQemu
+++ b/RunQemu
@@ -9,6 +9,7 @@ QEMU_PARAMS=""
 QEMU_PARAMS=$QEMU_PARAMS" -hda AcessHDD.img"
 QEMU_PARAMS=$QEMU_PARAMS" -vga std"
 QEMU_PARAMS=$QEMU_PARAMS" -smp 2"
+MODS=""
 
 _NETTYPE="user,hostfwd=tcp::5555-:23"
 _NETMODEL=e1000
@@ -20,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
@@ -28,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
 		;;
@@ -71,6 +76,15 @@ while [ $# -ne 0 ]; do
 		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
@@ -84,7 +98,7 @@ 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