From f0e7e2ae018cabdee3a87fa562ad7a4482d235b4 Mon Sep 17 00:00:00 2001 From: Jared Rossi Date: Fri, 8 Nov 2024 14:41:36 -0500 Subject: [PATCH 7/9] pc-bios/s390x: Initialize cdrom type to false for each IPL device RH-Author: Thomas Huth RH-MergeRequest: 297: [c10s] Fixes for the new s390x "boot order" feature RH-Jira: RHEL-68444 RH-Acked-by: Miroslav Rezanina RH-Commit: [6/8] efbe12669e2a20d1c8412edfc5e2350475b84dda (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 Reviewed-by: Thomas Huth Message-ID: <20241108194136.2833932-1-jrossi@linux.ibm.com> Signed-off-by: Thomas Huth (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