71aed0d95c
- kvm-virtio-net-Add-queues-before-loading-them.patch [RHEL-69477] - kvm-docs-system-s390x-bootdevices-Update-loadparm-docume.patch [RHEL-68440] - kvm-docs-system-bootindex-Make-it-clear-that-s390x-can-a.patch [RHEL-68440] - kvm-hw-s390x-Restrict-loadparm-property-to-devices-that-.patch [RHEL-68440] - kvm-hw-Add-loadparm-property-to-scsi-disk-devices-for-bo.patch [RHEL-68440] - kvm-scsi-fix-allocation-for-s390x-loadparm.patch [RHEL-68440] - kvm-pc-bios-s390x-Initialize-cdrom-type-to-false-for-eac.patch [RHEL-68440] - kvm-pc-bios-s390x-Initialize-machine-loadparm-before-pro.patch [RHEL-68440] - kvm-pc-bios-s390-ccw-Re-initialize-receive-queue-index-b.patch [RHEL-68440] - kvm-vnc-fix-crash-when-no-console-attached.patch [RHEL-61633] - Resolves: RHEL-69477 (qemu crashed when migrate vm with multiqueue from rhel9.4 to rhel9.6) - Resolves: RHEL-68440 (The new "boot order" feature is sometimes not working as expected [RHEL 9]) - Resolves: RHEL-61633 (Qemu-kvm crashed if no display device setting and switching display by remote-viewer [rhel-9])
56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
From d5fd6b575f36c09bb6ef11d3e1e4e698577637c3 Mon Sep 17 00:00:00 2001
|
|
From: Jared Rossi <jrossi@linux.ibm.com>
|
|
Date: Thu, 14 Nov 2024 11:19:52 -0500
|
|
Subject: [PATCH 08/10] pc-bios/s390x: Initialize machine loadparm before
|
|
probing IPL devices
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
RH-MergeRequest: 298: [c9s] Fixes for the new s390x "boot order" feature
|
|
RH-Jira: RHEL-68440
|
|
RH-Acked-by: Cédric Le Goater <clg@redhat.com>
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Commit: [7/8] 5f9bca4a83d6a1bde08504d2655f486708765e6e (thuth/qemu-kvm-cs9)
|
|
|
|
Commit bb185de423 ("s390x: Add individual loadparm assignment to
|
|
CCW device") allowed boot devices to be assigned a loadparm value independent
|
|
of the machine value, however, when no boot devices are defined, the machine
|
|
loadparm becomes ignored. Therefore, let's check the machine loadparm
|
|
prior to probing the devices.
|
|
|
|
Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
|
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
|
Message-ID: <20241114161952.3508554-1-jrossi@linux.ibm.com>
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
(cherry picked from commit 1056ca1e70dc6e0458238141bcebfb7810cede6d)
|
|
---
|
|
pc-bios/s390-ccw/main.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
|
|
index 7509755e36..76bf743900 100644
|
|
--- a/pc-bios/s390-ccw/main.c
|
|
+++ b/pc-bios/s390-ccw/main.c
|
|
@@ -191,7 +191,7 @@ static void boot_setup(void)
|
|
{
|
|
char lpmsg[] = "LOADPARM=[________]\n";
|
|
|
|
- if (memcmp(iplb.loadparm, NO_LOADPARM, LOADPARM_LEN) != 0) {
|
|
+ if (have_iplb && memcmp(iplb.loadparm, NO_LOADPARM, LOADPARM_LEN) != 0) {
|
|
ebcdic_to_ascii((char *) iplb.loadparm, loadparm_str, LOADPARM_LEN);
|
|
} else {
|
|
sclp_get_loadparm_ascii(loadparm_str);
|
|
@@ -316,6 +316,7 @@ void main(void)
|
|
css_setup();
|
|
have_iplb = store_iplb(&iplb);
|
|
if (!have_iplb) {
|
|
+ boot_setup();
|
|
probe_boot_device();
|
|
}
|
|
|
|
--
|
|
2.39.3
|
|
|