X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=RunQemu;h=68f6efc843606e071db651b3f083a6fdd5a586bc;hb=b60e6b273c3ecb1614d937bf9448033e9d339e83;hp=87cae417c5bda7f319a2e7971daace0f134bf26c;hpb=21192b41da0f87dba07dac08b2d814b0976d929c;p=tpg%2Facess2.git

diff --git a/RunQemu b/RunQemu
index 87cae417..68f6efc8 100755
--- a/RunQemu
+++ b/RunQemu
@@ -9,9 +9,12 @@ 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" -net nic,model=e1000"
+#QEMU_PARAMS=$QEMU_PARAMS" -net nic,model=rtl8139"
 
-_NETTYPE="user"
+_NETTYPE="user,hostfwd=tcp::5555-:23"
+
+_EVAL=eval
 
 while [ $# -ne 0 ]; do
 	case $1 in
@@ -47,6 +50,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"
 		;;
@@ -69,7 +75,7 @@ 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" -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"
@@ -80,13 +86,13 @@ fi
 #	qemu-system-x86_64 $QEMU_PARAMS -serial stdio | tee QemuLog.txt
 #echo $QEMU $BOOTOPT $QEMU_PARAMS
 if [ "x$_NOGRAPHIC" = "xyes" ] ; then
-	$QEMU $BOOTOPT $QEMU_PARAMS -nographic
+	$_EVAL $QEMU $BOOTOPT $QEMU_PARAMS -nographic | tee QemuLog.txt
 	exit
 fi
 
 if [ "x$_NOTEE" = "xyes" ] ; then
-	$QEMU $BOOTOPT $QEMU_PARAMS -serial stdio
+	$_EVAL $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio
 	exit
 fi
 
-eval $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio | tee QemuLog.txt
+$_EVAL $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio | tee QemuLog.txt