On Mon, 18 Dec 2017 17:11:52 -0500 "Collin L. Walling" <wall...@linux.vnet.ibm.com> wrote:
> On 12/14/2017 12:41 PM, Cornelia Huck wrote: > > On Mon, 11 Dec 2017 17:19:17 -0500 > > "Collin L. Walling" <wall...@linux.vnet.ibm.com> wrote: > > > >> ECKD DASDs have different IPL structures for CDL and LDL > >> formats. The current Ipl1 and Ipl2 structs follow the CDL > >> format, so we prepend "EckdCdl" to them. Boot info for LDL > >> has been moved to a new struct: EckdLdlIpl1. > >> > >> Also introduce structs for IPL stages 1 and 1b and for > >> disk geometry. > >> > >> Signed-off-by: Collin L. Walling <wall...@linux.vnet.ibm.com> > >> Acked-by: Janosch Frank <fran...@linux.vnet.ibm.com> > >> --- > >> pc-bios/s390-ccw/bootmap.c | 24 ++++++++++---------- > >> pc-bios/s390-ccw/bootmap.h | 55 > >> +++++++++++++++++++++++++++++++++------------- > >> 2 files changed, 53 insertions(+), 26 deletions(-) > >> > >> + mbr_block_nr = > >> + eckd_block_num((void > >> *)&(ipl1->boot_info.bp.ipl.bm_ptr.eckd.bptr)); > > Let me nominate this as "crazy nested struct of the week". > > > > (Just kidding, your patch certainly improves things in general :) > > > FWIW: we can reduce it to just ipl1->boot_info.bp-- the way the structs > are unioned > and the ordering of the fields make this possible. Thoughts? Ah, missed that one. I'd prefer to be explicit here, even if it is long.