--- [v4] ---
This round mostly includes some general cleanup to bootmap.c. Checkpatch did
not like any variation of "strtoi", so I properly implemented atoi instead.
- itostr and atoi now handle negative numbers (though not necessary
for these patches, it is available for robustness)
- refactored boot map code to use c/h/s struct
- refactored boot map code to use BootMapTable struct (not a critical change)
- fixed commit messages for eckd dasd boot menu patches
- clock comparator is set using timeout * TOD_CLOCK_SECOND instead
- general cleanup based on feedback from v3
- note: added extra info to cover letter summary about bootindex option
--- [Summary] ---
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'
The following must be specified for the device to be IPL'd from:
-device ...,bootindex=1
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.
<boot order='1' ... > must be specified for the device to be IPL'd from
A loadparm other than 'prompt' will disable the menu and just boot
the specified entry.
If no boot options are specified, we will attempt to use the values
provided by zipl (ECKD DASD only).
Collin L. Walling (10):
s390-ccw: refactor boot map table code
s390-ccw: refactor eckd_block_num to use CHS
s390-ccw: refactor IPL structs
s390-ccw: update libc
s390-ccw: parse and set boot menu options
s390-ccw: set up interactive boot menu parameters
s390-ccw: read stage2 boot loader data to find menu
s390-ccw: print zipl boot menu
s390-ccw: read user input for boot index via the SCLP console
s390-ccw: interactive boot menu for scsi
hw/s390x/ipl.c | 55 ++++++++++
hw/s390x/ipl.h | 11 +-
pc-bios/s390-ccw/Makefile | 2 +-
pc-bios/s390-ccw/bootmap.c | 183 +++++++++++++++++++++++----------
pc-bios/s390-ccw/bootmap.h | 89 +++++++++-------
pc-bios/s390-ccw/iplb.h | 11 +-
pc-bios/s390-ccw/libc.c | 116 +++++++++++++++++++++
pc-bios/s390-ccw/libc.h | 35 ++++++-
pc-bios/s390-ccw/main.c | 41 +++++---
pc-bios/s390-ccw/menu.c | 240 ++++++++++++++++++++++++++++++++++++++++++++
pc-bios/s390-ccw/menu.h | 25 +++++
pc-bios/s390-ccw/s390-ccw.h | 2 +
pc-bios/s390-ccw/sclp.c | 30 ++++--
pc-bios/s390-ccw/virtio.c | 2 +-
14 files changed, 722 insertions(+), 120 deletions(-)
create mode 100644 pc-bios/s390-ccw/libc.c
create mode 100644 pc-bios/s390-ccw/menu.c
create mode 100644 pc-bios/s390-ccw/menu.h
--
2.7.4
