[PATCH 3/4] kunit: tool: Allow overriding the shutdown mode from qemu config

Thomas Weißschuh posted 4 patches 1 month, 1 week ago
There is a newer version of this series
[PATCH 3/4] kunit: tool: Allow overriding the shutdown mode from qemu config
Posted by Thomas Weißschuh 1 month, 1 week ago
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.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
 tools/testing/kunit/kunit_kernel.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kunit_kernel.py
index 61931c4926fd6645f2c62dd13f9842a432ec4167..e76d7894b6c5195ece49f0d8c7ac35130df428a9 100644
--- a/tools/testing/kunit/kunit_kernel.py
+++ b/tools/testing/kunit/kunit_kernel.py
@@ -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
 

-- 
2.47.0

Re: [PATCH 3/4] kunit: tool: Allow overriding the shutdown mode from qemu config
Posted by David Gow 1 month, 1 week ago
On Mon, 14 Oct 2024 at 19:37, Thomas Weißschuh
<thomas.weissschuh@linutronix.de> wrote:
>
> 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.
>
> Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
> ---

I suspect there's a cleaner way of doing this, but it'd involve
changing all of the architectures over, so this looks good for now.

Reviewed-by: David Gow <davidgow@google.com>

Cheers,
-- David


>  tools/testing/kunit/kunit_kernel.py | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/tools/testing/kunit/kunit_kernel.py b/tools/testing/kunit/kunit_kernel.py
> index 61931c4926fd6645f2c62dd13f9842a432ec4167..e76d7894b6c5195ece49f0d8c7ac35130df428a9 100644
> --- a/tools/testing/kunit/kunit_kernel.py
> +++ b/tools/testing/kunit/kunit_kernel.py
> @@ -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
>
>
> --
> 2.47.0
>
> --
> You received this message because you are subscribed to the Google Groups "KUnit Development" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to kunit-dev+unsubscribe@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/kunit-dev/20241014-kunit-loongarch-v1-3-1699b2ad6099%40linutronix.de.