44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
|
From 32ddd9e68b04cb231fa0adcaeacbbe6373a1972f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jared Rossi <jrossi@linux.ibm.com>
|
||
|
|
Date: Fri, 8 Nov 2024 14:41:36 -0500
|
||
|
|
Subject: [PATCH 07/10] pc-bios/s390x: Initialize cdrom type to false for each
|
||
|
|
IPL device
|
||
|
|
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: [6/8] 994d24c3292a38f5bc7fd87d7227e5beb8abc30b (thuth/qemu-kvm-cs9)
|
||
|
|
|
||
|
|
Clear information about cdrom type so that current IPL device isn't tainted
|
||
|
|
by stale data from previous devices.
|
||
|
|
|
||
|
|
Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
|
||
|
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
Message-ID: <20241108194136.2833932-1-jrossi@linux.ibm.com>
|
||
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
(cherry picked from commit 8c797468116d19940fb758efa749eae414616e3a)
|
||
|
|
---
|
||
|
|
pc-bios/s390-ccw/main.c | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
|
||
|
|
index a4d1c05aac..7509755e36 100644
|
||
|
|
--- a/pc-bios/s390-ccw/main.c
|
||
|
|
+++ b/pc-bios/s390-ccw/main.c
|
||
|
|
@@ -242,6 +242,7 @@ static bool find_boot_device(void)
|
||
|
|
static int virtio_setup(void)
|
||
|
|
{
|
||
|
|
VDev *vdev = virtio_get_device();
|
||
|
|
+ vdev->is_cdrom = false;
|
||
|
|
int ret;
|
||
|
|
|
||
|
|
switch (vdev->senseid.cu_model) {
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|