diff options
author | Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com> | 2015-06-16 16:18:30 +0530 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-23 11:38:13 +0100 |
commit | 8b0527951ab71c4a4dc4d1238cd9e9e60a6eb5ee (patch) | |
tree | 4287cd7435396529db731619b39ac465f4f0d930 /scripts/runqemu-internal | |
parent | 2d2db8f517ea719f097c957559175a07ecee82ad (diff) | |
download | openembedded-core-contrib-8b0527951ab71c4a4dc4d1238cd9e9e60a6eb5ee.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 --
Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts/runqemu-internal')
-rwxr-xr-x | scripts/runqemu-internal | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index 3df18031a6a..694815fb749 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 |