summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Witt <randy.e.witt@linux.intel.com>2015-09-28 15:38:23 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-01 07:43:33 +0100
commit6f2047a0e278d29876451b5af8b8de156db33ed0 (patch)
tree11fc294aebaaa47f35aa5229535345157f4165a0
parent385a5e810501e4e717b646a14b10f0e705c188ad (diff)
downloadpoky-6f2047a0e278d29876451b5af8b8de156db33ed0.tar.gz
runqemu-internal: Make sure two serial ports always exist
Since inittab for qemu images now always tries to start getty on a second serial device, make sure that device exists. Otherwise the following message will be spammed: INIT: Id "S1" respawning too fast: disabled for 5 minutes [YOCTO #8374] (From OE-Core rev: 988369afed85281f3ed9b2f3eeb30f5408498bb9) Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/runqemu-internal32
1 files changed, 32 insertions, 0 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index d6b1102008..078545e931 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -700,6 +700,38 @@ if [ "x$SERIALSTDIO" = "x1" ]; then
700 stty intr ^] 700 stty intr ^]
701fi 701fi
702 702
703
704# Preserve the multiplexing behavior for the monitor that would be there based
705# on whether nographic is used.
706if echo "$QEMUOPTIONS $SERIALOPTS $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT" | grep -- "-nographic"; then
707 FIRST_SERIAL_OPT="-serial mon:stdio"
708else
709 FIRST_SERIAL_OPT="-serial mon:vc"
710fi
711
712# qemuarm64 uses virtio for any additional serial ports so the normal mechanism
713# of using -serial will not work
714if [ "$MACHINE" = "qemuarm64" ]; then
715 SECOND_SERIAL_OPT="$SCRIPT_QEMU_EXTRA_OPT -device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon"
716else
717 SECOND_SERIAL_OPT="-serial null"
718fi
719
720# We always want a ttyS1. Since qemu by default adds a serial port when
721# nodefaults is not specified, it seems that all that would be needed is to
722# make sure a "-serial" is there. However, it appears that when "-serial" is
723# specified, it ignores the default serial port that is normally added.
724# So here we make sure to add two -serial if there are none. And only one
725# if there is one -serial already.
726NUM_SERIAL_OPTS=`echo $QEMUOPTIONS $SERIALOPTS $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT | sed -e 's/ /\n/g' | grep --count -- -serial`
727
728if [ "$NUM_SERIAL_OPTS" = "0" ]; then
729 SCRIPT_QEMU_EXTRA_OPT="$SCRIPT_QEMU_EXTRA_OPT $FIRST_SERIAL_OPT $SECOND_SERIAL_OPT"
730elif [ "$NUM_SERIAL_OPTS" = "1" ]; then
731 SCRIPT_QEMU_EXTRA_OPT="$SCRIPT_QEMU_EXTRA_OPT $SECOND_SERIAL_OPT"
732fi
733
734
703echo "Running $QEMU..." 735echo "Running $QEMU..."
704# -no-reboot is a mandatory option - see bug #100 736# -no-reboot is a mandatory option - see bug #100
705if [ "$FSTYPE" = "vmdk" -o "$FSTYPE" = "hddimg" -o "$FSTYPE" = "hdddirect" ]; then 737if [ "$FSTYPE" = "vmdk" -o "$FSTYPE" = "hddimg" -o "$FSTYPE" = "hdddirect" ]; then