]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
kunit: tool: Allow overriding the shutdown mode from qemu config
authorThomas Weißschuh <thomas.weissschuh@linutronix.de>
Mon, 11 Nov 2024 05:29:19 +0000 (06:29 +0100)
committerShuah Khan <skhan@linuxfoundation.org>
Tue, 19 Nov 2024 22:26:30 +0000 (15:26 -0700)
Not all platforms support machine reboot.
If it a proper reboot is not supported the machine will hang.
Allow the QEMU configuration to override the necessary shutdown mode for
the specific system under test.

Link: https://lore.kernel.org/r/20241111-kunit-loongarch-v2-2-7676eb5f2da3@linutronix.de
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Reviewed-by: David Gow <davidgow@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
tools/testing/kunit/kunit_kernel.py

index 61931c4926fd6645f2c62dd13f9842a432ec4167..e76d7894b6c5195ece49f0d8c7ac35130df428a9 100644 (file)
@@ -105,7 +105,9 @@ class LinuxSourceTreeOperationsQemu(LinuxSourceTreeOperations):
                self._kconfig = qemu_arch_params.kconfig
                self._qemu_arch = qemu_arch_params.qemu_arch
                self._kernel_path = qemu_arch_params.kernel_path
-               self._kernel_command_line = qemu_arch_params.kernel_command_line + ' kunit_shutdown=reboot'
+               self._kernel_command_line = qemu_arch_params.kernel_command_line
+               if 'kunit_shutdown=' not in self._kernel_command_line:
+                       self._kernel_command_line += ' kunit_shutdown=reboot'
                self._extra_qemu_params = qemu_arch_params.extra_qemu_params
                self._serial = qemu_arch_params.serial