[oe-commits] [openembedded-core] 28/40: runqemu: Avoid duplicating custom QEMU options for AArch64

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit b18720ab98767d5c069e32588709fbb501be8e50
Author: Otavio Salvador <otavio at ossystems.com.br>
AuthorDate: Wed Jun 29 17:08:11 2016 -0300

    runqemu: Avoid duplicating custom QEMU options for AArch64
    
    When detecting the second serial options we shouldn't append the
    custom QEMU options otherwise we will end duplicating those.
    
    Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 scripts/runqemu-internal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index ea1a307..3f413e7 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -681,7 +681,7 @@ fi
 # qemuarm64 uses virtio for any additional serial ports so the normal mechanism
 # of using -serial will not work
 if [ "$MACHINE" = "qemuarm64" ]; then
-    SECOND_SERIAL_OPT="$SCRIPT_QEMU_EXTRA_OPT -device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon"
+    SECOND_SERIAL_OPT="-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon"
 else
     SECOND_SERIAL_OPT="-serial null"
 fi

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.