From 9c245f1d7919e5c8109a8f06f02b894e02f61cba Mon Sep 17 00:00:00 2001 From: Jagadeesh Krishnanjanappa Date: Tue, 16 Jun 2015 16:18:30 +0530 Subject: 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 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- scripts/runqemu-internal | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'scripts/runqemu-internal') 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 -- cgit v1.1