diff mbox series

kunit: tool: Use qemu-system-i386 for i386 runs

Message ID 20220513085108.3567310-1-davidgow@google.com
State Accepted
Commit e7eaffce47b7db72b077630dbe836f0c4132496d
Headers show
Series kunit: tool: Use qemu-system-i386 for i386 runs | expand

Commit Message

David Gow May 13, 2022, 8:51 a.m. UTC
We're currently using the x86_64 qemu for i386 builds. While this is not
incorrect, it's probably more sensible to use the i386 one, which will
at least fail properly if we accidentally were to build a 64-bit kernel.

Signed-off-by: David Gow <davidgow@google.com>
---
 tools/testing/kunit/qemu_configs/i386.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Brendan Higgins May 17, 2022, 8:38 p.m. UTC | #1
On Fri, May 13, 2022 at 4:51 AM David Gow <davidgow@google.com> wrote:
>
> We're currently using the x86_64 qemu for i386 builds. While this is not
> incorrect, it's probably more sensible to use the i386 one, which will
> at least fail properly if we accidentally were to build a 64-bit kernel.
>
> Signed-off-by: David Gow <davidgow@google.com>

A very sensible thing to do! When I was writing this, I probably
copied and pasted the x64_64 qemu config and then forgot to change
everything to i386 - whoops.

Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
diff mbox series

Patch

diff --git a/tools/testing/kunit/qemu_configs/i386.py b/tools/testing/kunit/qemu_configs/i386.py
index 52b80be40e4b..4463ebefd567 100644
--- a/tools/testing/kunit/qemu_configs/i386.py
+++ b/tools/testing/kunit/qemu_configs/i386.py
@@ -4,7 +4,7 @@  QEMU_ARCH = QemuArchParams(linux_arch='i386',
 			   kconfig='''
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y''',
-			   qemu_arch='x86_64',
+			   qemu_arch='i386',
 			   kernel_path='arch/x86/boot/bzImage',
 			   kernel_command_line='console=ttyS0',
 			   extra_qemu_params=[])