[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v2 5/6] tests/acceptance: Add a kludge to not us
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [RFC PATCH v2 5/6] tests/acceptance: Add a kludge to not use the default console |
Date: |
Thu, 21 Jun 2018 21:44:34 -0300 |
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é <address@hidden>
---
scripts/qemu.py | 6 ++++--
tests/acceptance/boot_linux_console.py | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/scripts/qemu.py b/scripts/qemu.py
index f099ce7278..7a975f4538 100644
--- a/scripts/qemu.py
+++ b/scripts/qemu.py
@@ -211,8 +211,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):
diff --git a/tests/acceptance/boot_linux_console.py
b/tests/acceptance/boot_linux_console.py
index 72cf5e943c..510742c4c7 100644
--- a/tests/acceptance/boot_linux_console.py
+++ b/tests/acceptance/boot_linux_console.py
@@ -69,9 +69,10 @@ class BootLinuxConsoleMips(Test):
kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
self.vm.set_machine('malta')
- self.vm.set_console()
+ self.vm.set_console("") # FIXME this disable isa-serial to use -serial
kernel_command_line = 'console=ttyS0 printk.time=0'
self.vm.add_args('-m', "64",
+ '-serial', "chardev:console", # FIXME ... here.
'-kernel', kernel_path,
'-append', kernel_command_line)
self.vm.launch()
--
2.18.0.rc2
- [Qemu-devel] [PATCH v2 0/6] Avocado: start multi-arch tests, add a Travis job, Philippe Mathieu-Daudé, 2018/06/21
- [Qemu-devel] [PATCH v2 2/6] tests/acceptance: Rename the x86-64 specific BootLinuxConsole test, Philippe Mathieu-Daudé, 2018/06/21
- [Qemu-devel] [PATCH v2 3/6] tests/acceptance: Improve the Avocado tags, Philippe Mathieu-Daudé, 2018/06/21
- [Qemu-devel] [RFC PATCH v2 5/6] tests/acceptance: Add a kludge to not use the default console,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v2 4/6] tests/acceptance: Add a BootLinuxConsoleMips test, Philippe Mathieu-Daudé, 2018/06/21
[Qemu-devel] [PATCH v2 6/6] travis: Add Avocado tests, Philippe Mathieu-Daudé, 2018/06/21
Re: [Qemu-devel] [PATCH v2 0/6] Avocado: start multi-arch tests, add a Travis job, Alex Bennée, 2018/06/28