On Tue, 28 Nov 2017 11:35:16 -0500 "Collin L. Walling" <wall...@linux.vnet.ibm.com> wrote:
> On 11/28/2017 05:35 AM, Cornelia Huck wrote: > > On Mon, 27 Nov 2017 15:55:31 -0500 > > "Collin L. Walling" <wall...@linux.vnet.ibm.com> wrote: > > > >> These patches implement a boot menu for ECKD DASD and SCSI guests on s390x. > >> The menu will only appear if the disk has been configured for IPL with the > >> zIPL tool and with the following QEMU command line options: > >> > >> -boot menu=on[,splash-time=X] and/or -machine loadparm='prompt' > >> > >> or via the following libvirt domain xml: > >> > >> <os> > >> <bootmenu enable='yes' timeout='X'/> > >> </os> > >> > >> or > >> > >> <disk> > >> ... > >> <boot order='1' loadparm='PROMPT'/> > >> </disk> > >> > >> Where X is some positive integer representing time in milliseconds. > >> > >> Loadparm will override all boot options. > > I have a bit of trouble parsing that last sentence: Do you mean a > > loadparm other than 'prompt' will disable the menu and just boot the > > specified entry, without any delay? (That's what would make most sense > > to me.) > > Correct. If loadparm is given boot index, we simply boot that entry. > I like "a loadparm other than 'prompt' will disable the menu and just > boot the specified entry"... I hope you don't mind if I steal it ;) Not at all :) > > > > >> Collin L. Walling (5): > >> s390-ccw: update libc.h > >> s390-ccw: ipl structs for eckd cdl/ldl > >> s390-ccw: parse and set boot menu options > >> s390-ccw: interactive boot menu for eckd dasd > >> s390-ccw: interactive boot menu for scsi > >> > >> hw/s390x/ipl.c | 23 +++++++ > >> hw/s390x/ipl.h | 8 ++- > >> pc-bios/s390-ccw/Makefile | 2 +- > >> pc-bios/s390-ccw/bootmap.c | 110 ++++++++++++++++++++++++++++------ > >> pc-bios/s390-ccw/bootmap.h | 73 +++++++++++++---------- > >> pc-bios/s390-ccw/iplb.h | 8 ++- > >> pc-bios/s390-ccw/libc.h | 94 +++++++++++++++++++++++++++++ > >> pc-bios/s390-ccw/main.c | 35 +++++------ > >> pc-bios/s390-ccw/menu.c | 122 +++++++++++++++++++++++++++++++++++++ > >> pc-bios/s390-ccw/s390-ccw.h | 7 +++ > >> pc-bios/s390-ccw/sclp.c | 142 > >> +++++++++++++++++++++++++++++++++++++++++--- > >> 11 files changed, 546 insertions(+), 78 deletions(-) > >> create mode 100644 pc-bios/s390-ccw/menu.c > >> > > >