From: Otavio Salvador Date: Wed, 29 Jun 2016 20:08:11 +0000 (-0300) Subject: runqemu: Avoid duplicating custom QEMU options for AArch64 X-Git-Tag: uninative-1.3~432 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=79798f20b2c0b98d84c3c4b14600635ff8ddfdad;p=openembedded-core.git 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 Signed-off-by: Ross Burton --- diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index ea1a307234..3f413e7788 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