Usermode/libc - Moved perror to errno.c and implimented it properly

[tpg/acess2.git] / RunQemu

diff --git a/RunQemu b/RunQemu
index 67f9145..68f6efc 100755 (executable)
--- 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
@@ -26,13 +29,20 @@ 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 -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"
                ;;
@@ -40,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"
                ;;
@@ -52,6 +65,9 @@ while [ $# -ne 0 ]; do
        -notee)
                _NOTEE="yes"
                ;;
+       -nographic)
+               _NOGRAPHIC="yes"
+               ;;
        esac
        shift
 done
@@ -59,6 +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" -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"
@@ -68,8 +85,14 @@ 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$_NOTEE" != "xyes" ] ; then
-       $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio | tee QemuLog.txt
-else
-       $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio
+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
+       exit
 fi
+
+$_EVAL $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio | tee QemuLog.txt