rpms/os-autoinst
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Drop "disable boot order" bit of ppc64le QEMU backend patch

Browse Source 
QEMU spapr/pseries honors -boot once=d / order=, so leaving
$arch_supports_boot_order disabled on ppc64le made install tests
that supply both an ISO and an HDD_1 boot the HDD instead of the
installer CD (same symptom as running x86_64 without -boot). Drop
that line from the patch so ppc64le behaves like x86_64.

Patch description updated to record the history; hunk shrinks by
one line and the patch diffstat updates accordingly.
This commit is contained in:
Andrew Lukoshko 2026-04-23 17:22:33 +02:00
parent 8d3dd9de1a
commit 58f6db9094
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
SOURCES/0001-Add-AArch64-and-ppc64le-support-to-QEMU-backend.patch
View File

@ -17,12 +17,18 @@ ppc64le:
- Use VirtIO Keyboard as a keyboard device. - Use VirtIO Keyboard as a keyboard device.
- Use VirtIO Tablet as a tablet device. - Use VirtIO Tablet as a tablet device.
- Do not remove floppy drive device since it's not supported. - Do not remove floppy drive device since it's not supported.
- Do not add boot order since it's not supported for this architecture.
Note: originally this patch also disabled boot-order (`-boot once=d` /
`-boot order=`). That turned out to be wrong - QEMU spapr (pseries)
does honor these flags, and without them install tests that supply
both an ISO and an HDD_1 boot the HDD instead of the installer CD on
ppc64le. The boot-order disable has been dropped so ppc64le behaves
like x86_64.
Signed-off-by: Elkhan Mammadli <elkhan.mammadli@protonmail.com> Signed-off-by: Elkhan Mammadli <elkhan.mammadli@protonmail.com>
--- ---
backend/qemu.pm | 15 ++++++++++----- backend/qemu.pm | 14 +++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-) 1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/backend/qemu.pm b/backend/qemu.pm diff --git a/backend/qemu.pm b/backend/qemu.pm
index 0a6275f4..904ec7bf 100644 index 0a6275f4..904ec7bf 100644
@ -36,13 +42,12 @@ index 0a6275f4..904ec7bf 100644
$self->_set_graphics_backend($is_arm); $self->_set_graphics_backend($is_arm);
@@ -762,7 +763,11 @@ sub start_qemu ($self) { @@ -762,7 +763,10 @@ sub start_qemu ($self) {
$arch_supports_boot_order = 0; $arch_supports_boot_order = 0;
$use_virtio_kbd = 1; $use_virtio_kbd = 1;
} }
- elsif ($vars->{OFW}) { - elsif ($vars->{OFW}) {
+ elsif ($is_ppc64le) { + elsif ($is_ppc64le) {
+ $arch_supports_boot_order = 0;
+ $use_virtio_kbd = 1; + $use_virtio_kbd = 1;
+ } + }
+ elsif ($vars->{OFW} && !$is_ppc64le) { + elsif ($vars->{OFW} && !$is_ppc64le) {

9
SPECS/os-autoinst.spec
View File

@ -37,7 +37,7 @@
Name: os-autoinst Name: os-autoinst
Version: %{github_version}%{?github_date:^%{github_date}git%{shortcommit}} Version: %{github_version}%{?github_date:^%{github_date}git%{shortcommit}}
Release: 3%{?dist} Release: 4%{?dist}
Summary: OS-level test automation Summary: OS-level test automation
License: GPLv2+ License: GPLv2+
URL: https://os-autoinst.github.io/openQA/ URL: https://os-autoinst.github.io/openQA/
@ -255,6 +255,13 @@ rm tools/lib/perlcritic/Perl/Critic/Policy/*.pm
%files devel %files devel
%changelog %changelog
* Thu Apr 23 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 4.6^20230731git6c17e24-4
- Drop the ppc64le "disable arch_supports_boot_order" bit from the
AArch64/ppc64le QEMU backend patch. QEMU spapr supports -boot
once=d / order=, and leaving it disabled makes install tests that
supply both an ISO and an HDD_1 boot the HDD instead of the
installer CD on ppc64le.
* Tue Apr 21 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 4.6^20230731git6c17e24-3 * Tue Apr 21 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 4.6^20230731git6c17e24-3
- Add AArch64 and ppc64le support to QEMU backend (by Elkhan Mammadli) - Add AArch64 and ppc64le support to QEMU backend (by Elkhan Mammadli)