Commit 5ffb8629 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Shuah Khan
Browse files

kunit: tool: Add support for overriding the QEMU serial port 



On some platforms, the console is not the first serial port.  To make
this work, the first serial port in QEMU must be set to "null".

Add support for this by adding an optional "serial" parameter, which
defaults to "stdio", and can be overridden by platform-specific
configuration.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarDavid Gow <davidgow@google.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent cb8865fd

tools/testing/kunit/kunit_kernel.py

+2 −1
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ class LinuxSourceTreeOperationsQemu(LinuxSourceTreeOperations): 
		self._kernel_path = qemu_arch_params.kernel_path

		self._kernel_command_line = qemu_arch_params.kernel_command_line + ' kunit_shutdown=reboot'

		self._extra_qemu_params = qemu_arch_params.extra_qemu_params

		self._serial = qemu_arch_params.serial



	def make_arch_config(self, base_kunitconfig: kunit_config.Kconfig) -> kunit_config.Kconfig:

		kconfig = kunit_config.parse_from_string(self._kconfig)
@@ -121,7 +122,7 @@ class LinuxSourceTreeOperationsQemu(LinuxSourceTreeOperations): 
				'-append', ' '.join(params + [self._kernel_command_line]),

				'-no-reboot',

				'-nographic',

				'-serial', 'stdio'] + self._extra_qemu_params

				'-serial', self._serial] + self._extra_qemu_params

		# Note: shlex.join() does what we want, but requires python 3.8+.

		print('Running tests with:\n$', ' '.join(shlex.quote(arg) for arg in qemu_command))

		return subprocess.Popen(qemu_command,

tools/testing/kunit/qemu_config.py

+1 −0
Original line number Diff line number Diff line
@@ -17,3 +17,4 @@ class QemuArchParams: 
  kernel_path: str

  kernel_command_line: str

  extra_qemu_params: List[str]

  serial: str = 'stdio'