From: Zhuoying Cai <[email protected]> Add S390_IPL_TYPE_PCI to the boot menu handling logic to enable interactive boot menu support for virtio PCI devices on s390x.
Signed-off-by: Zhuoying Cai <[email protected]> signed-off-by: Jared Rossi <[email protected]> --- 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 567e97bf32..be83d598e2 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); -- 2.54.0
