[oe-commits] Randy Witt : runqemu-internal: Make sure tcpserial is always last

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: c71309616a3247cfab969b74d8642ff0bf9b6500
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c71309616a3247cfab969b74d8642ff0bf9b6500

Author: Randy Witt <randy.e.witt at linux.intel.com>
Date:   Wed Aug 26 15:15:34 2015 -0700

runqemu-internal: Make sure tcpserial is always last

If this is not the case, sometimes the additional tcpserial will be
enumerated as ttyS0, which is not what we want. Because then it would be
the console, and qemurunner would not log things properly.

Signed-off-by: Randy Witt <randy.e.witt at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 scripts/runqemu-internal | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index b317358..baf53f3 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -622,9 +622,9 @@ fi
 
 if [ $TCPSERIAL_PORTNUM != "" ]; then
     if [ "$MACHINE" = "qemuarm64" ]; then
-        QEMUOPTIONS="$QEMUOPTIONS -device virtio-serial-device -chardev socket,id=virtcon,port=$TCPSERIAL_PORTNUM,host=127.0.0.1 -device virtconsole,chardev=virtcon"
+        SCRIPT_QEMU_EXTRA_OPT="$SCRIPT_QEMU_EXTRA_OPT -device virtio-serial-device -chardev socket,id=virtcon,port=$TCPSERIAL_PORTNUM,host=127.0.0.1 -device virtconsole,chardev=virtcon"
     else
-        QEMUOPTIONS="$QEMUOPTIONS -serial tcp:127.0.0.1:$TCPSERIAL_PORTNUM"
+        SCRIPT_QEMU_EXTRA_OPT="$SCRIPT_QEMU_EXTRA_OPT -serial tcp:127.0.0.1:$TCPSERIAL_PORTNUM"
     fi
 fi