[Qemu-devel] [RFC PATCH v3 2/6] tests/acceptance: Add a kludge to not use the default console - Philippe Mathieu-Daudé

From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: "Alex Bennée" <alex.bennee@linaro.org>,
	"Cleber Rosa" <crosa@redhat.com>,
	"Eduardo Habkost" <ehabkost@redhat.com>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	qemu-devel@nongnu.org, "Lukáš Doktor" <ldoktor@redhat.com>,
	"Fam Zheng" <famz@redhat.com>
Subject: [Qemu-devel] [RFC PATCH v3 2/6] tests/acceptance: Add a kludge to not use the default console
Date: Sat, 13 Oct 2018 17:15:41 +0200	[thread overview]
Message-ID: <20181013151545.3731-3-f4bug@amsat.org> (raw)
In-Reply-To: <20181013151545.3731-1-f4bug@amsat.org>

The board already instantiate the proper devices, we don't want to
add extra devices but connect the chardev to one of the serial already
available.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 scripts/qemu.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/qemu.py b/scripts/qemu.py
index fca9b76990..7e779954e6 100644
--- a/scripts/qemu.py
+++ b/scripts/qemu.py
@@ -221,8 +221,10 @@ class QEMUMachine(object):
                                                  self._name + "-console.sock")
             chardev = ('socket,id=console,path=%s,server,nowait' %
                        self._console_address)
-            device = '%s,chardev=console' % self._console_device_type
-            args.extend(['-chardev', chardev, '-device', device])
+            args.extend(['-chardev', chardev])
+            if len(self._console_device_type):
+                device = '%s,chardev=console' % self._console_device_type
+                args.extend(['-device', device])
         return args
 
     def _pre_launch(self):
-- 
2.19.1
