From 58f6db90946af0c4e9142c17a6f85a3a00a0d93c Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Thu, 23 Apr 2026 17:22:33 +0200 Subject: [PATCH] Drop "disable boot order" bit of ppc64le QEMU backend patch 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. --- ...ch64-and-ppc64le-support-to-QEMU-backend.patch | 15 ++++++++++----- SPECS/os-autoinst.spec | 9 ++++++++- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/SOURCES/0001-Add-AArch64-and-ppc64le-support-to-QEMU-backend.patch b/SOURCES/0001-Add-AArch64-and-ppc64le-support-to-QEMU-backend.patch index c50c924..def830d 100644 --- a/SOURCES/0001-Add-AArch64-and-ppc64le-support-to-QEMU-backend.patch +++ b/SOURCES/0001-Add-AArch64-and-ppc64le-support-to-QEMU-backend.patch @@ -17,12 +17,18 @@ ppc64le: - Use VirtIO Keyboard as a keyboard device. - Use VirtIO Tablet as a tablet device. - 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 --- - backend/qemu.pm | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) + backend/qemu.pm | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/backend/qemu.pm b/backend/qemu.pm index 0a6275f4..904ec7bf 100644 @@ -36,13 +42,12 @@ index 0a6275f4..904ec7bf 100644 $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; $use_virtio_kbd = 1; } - elsif ($vars->{OFW}) { + elsif ($is_ppc64le) { -+ $arch_supports_boot_order = 0; + $use_virtio_kbd = 1; + } + elsif ($vars->{OFW} && !$is_ppc64le) { diff --git a/SPECS/os-autoinst.spec b/SPECS/os-autoinst.spec index b3bf29e..0a5d27b 100644 --- a/SPECS/os-autoinst.spec +++ b/SPECS/os-autoinst.spec @@ -37,7 +37,7 @@ Name: os-autoinst Version: %{github_version}%{?github_date:^%{github_date}git%{shortcommit}} -Release: 3%{?dist} +Release: 4%{?dist} Summary: OS-level test automation License: GPLv2+ URL: https://os-autoinst.github.io/openQA/ @@ -255,6 +255,13 @@ rm tools/lib/perlcritic/Perl/Critic/Policy/*.pm %files devel %changelog +* Thu Apr 23 2026 Andrew Lukoshko - 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 - 4.6^20230731git6c17e24-3 - Add AArch64 and ppc64le support to QEMU backend (by Elkhan Mammadli)