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@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index ea1a307234f4e2ea148dad33ca7227c20d61c948..3f413e77880b1bd68eb9d7ae76ddb7c6c555da10 100755 (executable)
--- 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