diff mbox series

runqemu: Fix detection of -serial parameter

Message ID d2bebf1bef0e855cfefc771bd86e95d29b8d4cc2.1724956424.git.joerg.sommer@navimatix.de
State Accepted, archived
Commit b6d035894120b45b42f146ab5b3110522c58d178
Headers show
Series runqemu: Fix detection of -serial parameter | expand

Commit Message

Jörg Sommer Aug. 29, 2024, 6:33 p.m. UTC 
From: Jörg Sommer <joerg.sommer@navimatix.de>

The pattern `-serial` matches also `-device usb-serial` and `virtio-serial`
which are not the desired parameter. This causes the serial console ttyS1 is
missing and Systemd's getty@ttyS1 fails constantly.

Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
---
 scripts/runqemu | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/scripts/runqemu b/scripts/runqemu
index 69cd44864e..f350021258 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -1483,7 +1483,7 @@  to your build configuration.
         # If no serial or serialtcp options were specified, only ttyS0 is created
         # and sysvinit shows an error trying to enable ttyS1:
         #     INIT: Id "S1" respawning too fast: disabled for 5 minutes
-        serial_num = len(re.findall("-serial", self.qemu_opt))
+        serial_num = len(re.findall("(^| )-serial ", self.qemu_opt))
 
         # Assume if the user passed serial options, they know what they want
         # and pad to two devices
@@ -1503,7 +1503,7 @@  to your build configuration.
 
                 self.qemu_opt += " %s" % self.get("QB_SERIAL_OPT")
 
-        serial_num = len(re.findall("-serial", self.qemu_opt))
+        serial_num = len(re.findall("(^| )-serial ", self.qemu_opt))
         if serial_num < 2:
             self.qemu_opt += " -serial null"