Commit ffb4a1c8 authored by Collin L. Walling's avatar Collin L. Walling Committed by Thomas Huth
Browse files

s390-ccw: interactive boot menu for scsi 



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: default avatarCollin L. Walling <walling@linux.vnet.ibm.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
[thuth: Added additional "break;" statement to avoid analyzer warnings]
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
parent 53b310ce

hw/s390x/ipl.c

+2 −0
Original line number Diff line number Diff line
@@ -247,6 +247,8 @@ static void s390_ipl_set_boot_menu(S390IPLState *ipl) 
            return;

        }

        break;

    case S390_IPL_TYPE_QEMU_SCSI:

        break;

    default:

        error_report("boot menu is not supported for this device type.");

        return;

pc-bios/s390-ccw/bootmap.c

+4 −0
Original line number Diff line number Diff line
@@ -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_enum()) {

        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");

pc-bios/s390-ccw/main.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

pc-bios/s390-ccw/menu.c

+20 −0
Original line number Diff line number Diff line
@@ -217,6 +217,21 @@ 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;
@@ -227,3 +242,8 @@ bool menu_is_enabled_zipl(void) 
{

    return flag & (QIPL_FLAG_BM_OPTS_CMD | QIPL_FLAG_BM_OPTS_ZIPL);

}



bool menu_is_enabled_enum(void)

{

    return flag & QIPL_FLAG_BM_OPTS_CMD;

}

pc-bios/s390-ccw/s390-ccw.h

+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ void zipl_load(void); 
void menu_set_parms(uint8_t boot_menu_flag, uint32_t boot_menu_timeout);

int menu_get_zipl_boot_index(const char *menu_data);

bool menu_is_enabled_zipl(void);

int menu_get_enum_boot_index(int entries);

bool menu_is_enabled_enum(void);



static inline void fill_hex(char *out, unsigned char val)

{