| Message ID | 1519241752-28083-14-git-send-email-walling@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 21.02.2018 20:35, Collin L. Walling wrote: > Interactive boot menu for scsi. This follows a similar procedure > as the interactive menu for eckd dasd. An example follows: > > s390x Enumerated Boot Menu. > > 3 entries detected. Select from index 0 to 2. > > Signed-off-by: Collin L. Walling <walling@linux.vnet.ibm.com> > Reviewed-by: Thomas Huth <thuth@redhat.com> > --- > hw/s390x/ipl.c | 1 + > pc-bios/s390-ccw/bootmap.c | 4 ++++ > pc-bios/s390-ccw/main.c | 1 + > pc-bios/s390-ccw/menu.c | 14 ++++++++++++++ > pc-bios/s390-ccw/s390-ccw.h | 1 + > 5 files changed, 21 insertions(+) > > diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c > index a0f4f40..566248e 100644 > --- a/hw/s390x/ipl.c > +++ b/hw/s390x/ipl.c > @@ -238,6 +238,7 @@ static void s390_ipl_set_boot_menu(S390IPLState *ipl) > *flags |= QIPL_FLAG_BM_OPTS_ZIPL; > return; > } > + case S390_IPL_TYPE_QEMU_SCSI: > break; It's not a real bug, but I'm pretty sure this will cause Coverity to report an issue of unintended switch-case fall through. Could you please add a break before the new case label? (Since all other patches look fine to me, this could maybe also be fixed when the patches are picked up, so no need to respin the whole patch series just because of this) Thomas
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index a0f4f40..566248e 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -238,6 +238,7 @@ static void s390_ipl_set_boot_menu(S390IPLState *ipl) *flags |= QIPL_FLAG_BM_OPTS_ZIPL; return; } + case S390_IPL_TYPE_QEMU_SCSI: break; default: error_report("boot menu is not supported for this device type."); diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c index 2701ae6..81dbd4a 100644 --- a/pc-bios/s390-ccw/bootmap.c +++ b/pc-bios/s390-ccw/bootmap.c @@ -568,6 +568,10 @@ static void ipl_scsi(void) debug_print_int("program table entries", program_table_entries); IPL_assert(program_table_entries != 0, "Empty Program Table"); + if (menu_is_enabled()) { + loadparm = menu_get_enum_boot_index(program_table_entries); + } + debug_print_int("loadparm", loadparm); IPL_assert(loadparm <= MAX_TABLE_ENTRIES, "loadparm value greater than" " maximum number of boot entries allowed"); diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c index a7473b0..9d9f8cf 100644 --- a/pc-bios/s390-ccw/main.c +++ b/pc-bios/s390-ccw/main.c @@ -92,6 +92,7 @@ static void menu_setup(void) switch (iplb.pbt) { case S390_IPL_TYPE_CCW: + case S390_IPL_TYPE_QEMU_SCSI: menu_set_parms(qipl.qipl_flags & BOOT_MENU_FLAG_MASK, qipl.boot_menu_timeout); return; diff --git a/pc-bios/s390-ccw/menu.c b/pc-bios/s390-ccw/menu.c index 4fc328d..16b5310 100644 --- a/pc-bios/s390-ccw/menu.c +++ b/pc-bios/s390-ccw/menu.c @@ -217,6 +217,20 @@ int menu_get_zipl_boot_index(const char *menu_data) return get_boot_index(entries - 1); /* subtract 1 to exclude banner */ } +int menu_get_enum_boot_index(int entries) +{ + char tmp[4]; + + sclp_print("s390x Enumerated Boot Menu.\n\n"); + + sclp_print(uitoa(entries, tmp, sizeof(tmp))); + sclp_print(" entries detected. Select from boot index 0 to "); + sclp_print(uitoa(entries - 1, tmp, sizeof(tmp))); + sclp_print(".\n\n"); + + return get_boot_index(entries); +} + void menu_set_parms(uint8_t boot_menu_flag, uint32_t boot_menu_timeout) { flag = boot_menu_flag; diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h index 56b0c2a..cfcaf3c 100644 --- a/pc-bios/s390-ccw/s390-ccw.h +++ b/pc-bios/s390-ccw/s390-ccw.h @@ -91,6 +91,7 @@ void zipl_load(void); void menu_set_parms(uint8_t boot_menu_flag, uint32_t boot_menu_timeout); bool menu_is_enabled(void); int menu_get_zipl_boot_index(const char *menu_data); +int menu_get_enum_boot_index(int entries); static inline void fill_hex(char *out, unsigned char val) {
Interactive boot menu for scsi. This follows a similar procedure as the interactive menu for eckd dasd. An example follows: s390x Enumerated Boot Menu. 3 entries detected. Select from index 0 to 2. Signed-off-by: Collin L. Walling <walling@linux.vnet.ibm.com> Reviewed-by: Thomas Huth <thuth@redhat.com> --- hw/s390x/ipl.c | 1 + pc-bios/s390-ccw/bootmap.c | 4 ++++ pc-bios/s390-ccw/main.c | 1 + pc-bios/s390-ccw/menu.c | 14 ++++++++++++++ pc-bios/s390-ccw/s390-ccw.h | 1 + 5 files changed, 21 insertions(+)