On Tue, 29 Jan 2019 08:29:10 -0500 "Jason J. Herne" <jjhe...@linux.ibm.com> wrote:
> Create a boot_setup function to handle getting boot information from > the machine/hypervisor. This decouples common boot logic from the > virtio code path and allows us to make use of it for the real dasd boot > scenario. > > Signed-off-by: Jason J. Herne <jjhe...@linux.ibm.com> > Acked-by: Halil Pasic <pa...@linux.vnet.ibm.com> > Reviewed-by: Collin Walling <wall...@linux.ibm.com > Reviewed-by: Thomas Huth <th...@redhat.com> > --- > pc-bios/s390-ccw/main.c | 28 ++++++++++++++++++++-------- > 1 file changed, 20 insertions(+), 8 deletions(-) > > diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c > index e82fe2c..67df421 100644 > --- a/pc-bios/s390-ccw/main.c > +++ b/pc-bios/s390-ccw/main.c > @@ -14,16 +14,17 @@ > > char stack[PAGE_SIZE * 8] __attribute__((__aligned__(PAGE_SIZE))); > static SubChannelId blk_schid = { .one = 1 }; > -IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE))); > static char loadparm_str[LOADPARM_LEN + 1] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }; > QemuIplParameters qipl; > +IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE))); > +static bool have_iplb; > > #define LOADPARM_PROMPT "PROMPT " > #define LOADPARM_EMPTY " " > #define BOOT_MENU_FLAG_MASK (QIPL_FLAG_BM_OPTS_CMD | QIPL_FLAG_BM_OPTS_ZIPL) > > /* > - * Priniciples of Operations (SA22-7832-09) chapter 17 requires that > + * Principles of Operations (SA22-7832-09) chapter 17 requires that > * a subsystem-identification is at 184-187 and bytes 188-191 are zero > * after list-directed-IPL and ccw-IPL. > */ Some unrelated change :) But it really does not make sense to split this out. Reviewed-by: Cornelia Huck <coh...@redhat.com>