[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 01/15] grub-shell: only pass SeaBIOS fw_opt in for x86 BIOS pl
From: |
Daniel Axtens |
Subject: |
[PATCH v2 01/15] grub-shell: only pass SeaBIOS fw_opt in for x86 BIOS platforms |
Date: |
Mon, 28 Mar 2022 17:22:26 +1100 |
This breaks the tests on pseries - just restrict it to x86 platforms
that don't specify a BIOS.
Signed-off-by: Daniel Axtens <dja@axtens.net>
---
v2: Thanks Daniel K and Glenn for feedback.
---
tests/util/grub-shell.in | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 33590baeb13c..4828afb7cc5a 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -376,7 +376,11 @@ if test -z "$debug"; then
# workaround unfortunately causes qemu to issue a warning 'externally
# provided fw_cfg item names should be prefixed with "opt/"', but there
# doesn't seem to be a better option.
- qemuopts="${qemuopts} -fw_cfg name=etc/sercon-port,string=0"
+ #
+ # SeaBIOS is used for i386, except on EFI.
+ if [ ${grub_modinfo_target_cpu} == 'i386' ] && [ ${grub_modinfo_platform} !=
'efi' ]; then
+ qemuopts="${qemuopts} -fw_cfg name=etc/sercon-port,string=0"
+ fi
fi
if [ x$boot != xnet ] && [ x$boot != xemu ]; then
--
2.32.0
- [PATCH v2 00/15] Dynamic allocation of memory regions and IBM vTPM v2, Daniel Axtens, 2022/03/28
- [PATCH v2 02/15] mm: assert that we preserve header vs region alignment, Daniel Axtens, 2022/03/28
- [PATCH v2 03/15] mm: when adding a region, merge with region after as well as before, Daniel Axtens, 2022/03/28
- [PATCH v2 01/15] grub-shell: only pass SeaBIOS fw_opt in for x86 BIOS platforms,
Daniel Axtens <=
- [PATCH v2 04/15] mm: debug support for region operations, Daniel Axtens, 2022/03/28
- [PATCH v2 05/15] mm: Drop unused unloading of modules on OOM, Daniel Axtens, 2022/03/28
- [PATCH v2 06/15] mm: Allow dynamically requesting additional memory regions, Daniel Axtens, 2022/03/28
- [PATCH v2 07/15] efi: mm: Always request a fixed number of pages on init, Daniel Axtens, 2022/03/28
- [PATCH v2 08/15] efi: mm: Extract function to add memory regions, Daniel Axtens, 2022/03/28
- [PATCH v2 10/15] efi: mm: Implement runtime addition of pages, Daniel Axtens, 2022/03/28
- [PATCH v2 09/15] efi: mm: Pass up errors from `add_memory_regions ()`, Daniel Axtens, 2022/03/28
- [PATCH v2 11/15] ieee1275: request memory with ibm, client-architecture-support, Daniel Axtens, 2022/03/28
- [PATCH v2 12/15] ieee1275: drop len -= 1 quirk in heap_init, Daniel Axtens, 2022/03/28
- [PATCH v2 13/15] ieee1275: support runtime memory claiming, Daniel Axtens, 2022/03/28