Allow user-specified options to be passed to qemu via poky-qemu

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4327 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Ross Burton 2008-04-24 14:30:55 +00:00
parent 5e6ec763b7
commit 85049069b0
2 changed files with 8 additions and 5 deletions

View File

@ -20,22 +20,24 @@
if [ "x$1" = "x" ]; then
MYNAME=`basename $0`
echo "Run as MACHINE=xyz $MYNAME ZIMAGE IMAGEFILE"
echo "Run as MACHINE=xyz $MYNAME ZIMAGE IMAGEFILE [OPTIONS]"
echo "where:"
echo " ZIMAGE - the kernel image file to use"
echo " IMAGEFILE - the image file/location to use"
echo " (NFS booting assumed if IMAGEFILE not specified)"
echo " MACHINE=xyz - the machine name (optional, autodetected from ZIMAGE if unspecified)"
echo " OPTIONS - extra options to pass to QEMU"
exit 1
else
ZIMAGE=$1
shift
fi
if [ "x$MACHINE" = "x" ]; then
MACHINE=`basename $ZIMAGE | sed -r -e 's#.*-([a-z]+[0-9]*)-?[0-9]*..*#\1#'`
fi
if [ "x$2" = "x" ]; then
if [ "x$1" = "x" ]; then
TYPE="nfs"
else
TYPE="ext2"
@ -51,7 +53,8 @@ else
if [ "$MACHINE" = "nokia800-maemo" ]; then
TYPE="jffs2"
fi
HDIMAGE=$2
HDIMAGE=$1
shift
fi
INTERNAL_SCRIPT=`which poky-qemu-internal`

View File

@ -215,8 +215,8 @@ else
fi
echo "Running $QEMU using sudo..."
echo $QEMUBIN -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS --append "$KERNCMDLINE"
sudo $QEMUBIN -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS --append "$KERNCMDLINE" || /bin/true
echo $QEMUBIN -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS $* --append "$KERNCMDLINE"
sudo $QEMUBIN -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS $* --append "$KERNCMDLINE" || /bin/true
trap - INT TERM QUIT
return