summaryrefslogtreecommitdiffstats
path: root/scripts/runqemu-internal
diff options
context:
space:
mode:
authorJagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>2015-06-16 16:18:30 +0530
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-28 09:44:19 +0100
commit9c245f1d7919e5c8109a8f06f02b894e02f61cba (patch)
tree3c9d9589c586c2530c7d6e6ec47458cf62fc70fa /scripts/runqemu-internal
parentd3959f672a31b498179d0cc3e83705e5f8349a78 (diff)
downloadast2050-yocto-poky-9c245f1d7919e5c8109a8f06f02b894e02f61cba.zip
ast2050-yocto-poky-9c245f1d7919e5c8109a8f06f02b894e02f61cba.tar.gz
runqemu-internal: set mutual exclusiveness for serial and nographic options
Use "-nographic" option only if "serial" option is not specified. Otherwise we get below error when 'runqemu <kernel_image> <rootfs_image> serial' is executed, (snip) QEMU 2.2.0 monitor - type 'help' for more information (qemu) qemu-system-aarch64: -serial stdio: cannot use stdio by multiple character devices -- CUT -- (From OE-Core rev: 8b0527951ab71c4a4dc4d1238cd9e9e60a6eb5ee) (From OE-Core rev: c3a44794de957b216aaea19da371657194c86fc3) Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu-internal')
-rwxr-xr-xscripts/runqemu-internal9
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index fb51754..e346c64 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -275,9 +275,6 @@ else
KERNCMDLINE="mem=$QEMU_MEMORY"
QEMU_UI_OPTIONS="-show-cursor -usb -usbdevice wacom-tablet"
- if [ $MACHINE = 'qemuarm64' ]; then
- QEMU_UI_OPTIONS="-nographic"
- fi
NFS_INSTANCE=`echo $TAP | sed 's/tap//'`
export NFS_INSTANCE
@@ -383,7 +380,11 @@ if [ "$MACHINE" = "qemuarm64" ]; then
QEMU=qemu-system-aarch64
export QEMU_AUDIO_DRV="none"
- QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
+ if [ "x$SERIALSTDIO" = "x" ] ; then
+ QEMU_UI_OPTIONS="-nographic"
+ else
+ QEMU_UI_OPTIONS=""
+ fi
if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
KERNCMDLINE="root=/dev/vda rw console=ttyAMA0,38400 mem=$QEMU_MEMORY highres=off $KERNEL_NETWORK_CMD"
# qemu-system-aarch64 only support '-machine virt -cpu cortex-a57' for now
OpenPOWER on IntegriCloud