[v3,15/16] python/qemu/machine: Allow to use other serial consoles than default
diff mbox series

Message ID 20191019234715.25750-16-f4bug@amsat.org
State New
Headers show
  • hw/arm/raspi: Add thermal/timer, improve address space, run U-boot
Related show

Commit Message

Philippe Mathieu-Daudé Oct. 19, 2019, 11:47 p.m. UTC
Currently the QEMU Python module limits the QEMUMachine class to
use the first serial console.

Some machines/guest might use another console than the first one as
the 'boot console'. For example the Raspberry Pi uses the second
(AUX) console.

To be able to use the Nth console as default, we simply need to
connect all the N - 1 consoles to the null chardev.

Add an index argument, so we can use a specific serial console as

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
- renamed 'console_index', added docstring (Cleber)
- reworded description (pm215)
 python/qemu/machine.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff mbox series

diff --git a/python/qemu/machine.py b/python/qemu/machine.py
index 128a3d1dc2..6fa68fa35a 100644
--- a/python/qemu/machine.py
+++ b/python/qemu/machine.py
@@ -235,6 +235,8 @@  class QEMUMachine(object):
                 '-display', 'none', '-vga', 'none']
         if self._machine is not None:
             args.extend(['-machine', self._machine])
+        for i in range(self._console_index):
+            args.extend(['-serial', 'null'])
         if self._console_set:
             self._console_address = os.path.join(self._temp_dir,
                                                  self._name + "-console.sock")
@@ -495,7 +497,7 @@  class QEMUMachine(object):
         self._machine = machine_type
-    def set_console(self, device_type=None):
+    def set_console(self, device_type=None, console_index=0):
         Sets the device type for a console device
@@ -516,9 +518,14 @@  class QEMUMachine(object):
                             chardev:console" command line argument will
                             be used instead, resorting to the machine's
                             default device type.
+        @param console_index: the index of the console device to use.
+                              If not zero, the command line will create
+                              'index - 1' consoles and connect them to
+                              the 'null' backing character device.
         self._console_set = True
         self._console_device_type = device_type
+        self._console_index = console_index
     def console_socket(self):