From b2b5dec92959af20850c3112bf12090afad4fa66 Mon Sep 17 00:00:00 2001 From: Zhuoying Cai Date: Tue, 30 Jun 2026 10:19:17 -0400 Subject: [PATCH] s390x: Enable boot menu for virtio pci device Add S390_IPL_TYPE_PCI to the boot menu handling logic to enable interactive boot menu support for virtio PCI devices on s390x. Reviewed-by: Eric Farman Signed-off-by: Zhuoying Cai Signed-off-by: Jared Rossi Reviewed-by: Matthew Rosato Tested-by: Matthew Rosato Message-ID: <20260630141917.673995-7-jrossi@linux.ibm.com> Signed-off-by: Cornelia Huck --- hw/s390x/ipl.c | 1 + pc-bios/s390-ccw/main.c | 1 + 2 files changed, 2 insertions(+) diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 4cca21c621..d5fdc3ea0f 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -315,6 +315,7 @@ static void s390_ipl_set_boot_menu(S390IPLState *ipl) return; } break; + case S390_IPL_TYPE_PCI: case S390_IPL_TYPE_QEMU_SCSI: break; default: diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c index 9c147ac5fa..8bc6e8eaa3 100644 --- a/pc-bios/s390-ccw/main.c +++ b/pc-bios/s390-ccw/main.c @@ -185,6 +185,7 @@ static void menu_setup(VDev *vdev) switch (vdev->ipl_type) { case S390_IPL_TYPE_CCW: + case S390_IPL_TYPE_PCI: case S390_IPL_TYPE_QEMU_SCSI: menu_set_parms(qipl.qipl_flags & BOOT_MENU_FLAG_MASK, qipl.boot_menu_timeout);