git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modules/PS2KbMouse - (minor) Cleanup 8042 driver a little
[tpg/acess2.git]
/
RunQemu
diff --git
a/RunQemu
b/RunQemu
index
b73a9f3
..
e69a55e
100755
(executable)
--- a/
RunQemu
+++ b/
RunQemu
@@
-9,15
+9,22
@@
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" -hda AcessHDD.img"
QEMU_PARAMS=$QEMU_PARAMS" -vga std"
QEMU_PARAMS=$QEMU_PARAMS" -smp 2"
-
QEMU_PARAMS=$QEMU_PARAMS" -net nic
"
+
MODS="
"
-_NETTYPE="user"
+_NETTYPE="user,hostfwd=tcp::5555-:23"
+_NETMODEL=e1000
+
+_EVAL=eval
while [ $# -ne 0 ]; do
case $1 in
-gdb)
QEMU_PARAMS=$QEMU_PARAMS" -s -S"
;;
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
-dbin)
shift
if [ "x$2" = "xdefault" ] || [ "x$2" = "x" ]; then
@@
-26,7
+33,7
@@
while [ $# -ne 0 ]; do
_kfile="KernelLand/Acess2.$1-$2.bin"
fi
BOOTOPT="-kernel $_kfile"
_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
;;
shift
shift
;;
@@
-47,6
+54,9
@@
while [ $# -ne 0 ]; do
shift
QEMU_PARAMS=$QEMU_PARAMS" "$1
;;
shift
QEMU_PARAMS=$QEMU_PARAMS" "$1
;;
+ -n)
+ _EVAL=echo
+ ;;
-fwd)
_NETTYPE=$_NETTYPE",hostfwd=tcp::10023-10.0.2.10:23"
;;
-fwd)
_NETTYPE=$_NETTYPE",hostfwd=tcp::10023-10.0.2.10:23"
;;
@@
-62,9
+72,19
@@
while [ $# -ne 0 ]; do
-nographic)
_NOGRAPHIC="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"
+ ;;
esac
shift
done
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" -net "$_NETTYPE
if [ "x$_NOUSB" != "xyes" ] ; then
@@
-73,20
+93,21
@@
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" -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
+ _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
#echo $QEMU $BOOTOPT $QEMU_PARAMS
if [ "x$_NOGRAPHIC" = "xyes" ] ; then
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$_NOGRAPHIC" = "xyes" ] ; then
- eval $QEMU $BOOTOPT $QEMU_PARAMS -nographic
- exit
-fi
-
-if [ "x$_NOTEE" = "xyes" ] ; then
- eval $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio
+ $_EVAL $QEMU $BOOTOPT $QEMU_PARAMS -nographic $_TEECMD
exit
fi
exit
fi
-eval $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio | tee QemuLog.txt
+$_EVAL $QEMU $BOOTOPT $QEMU_PARAMS -serial stdio $_TEECMD
UCC
git Repository :: git.ucc.asn.au