[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [qemu-s390x] [PATCH 4/4] pc-bios/s390-ccw: fix non-sequential boot e
From: |
Thomas Huth |
Subject: |
Re: [qemu-s390x] [PATCH 4/4] pc-bios/s390-ccw: fix non-sequential boot entries (enum) |
Date: |
Fri, 13 Apr 2018 09:55:03 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 |
On 10.04.2018 17:01, Collin Walling wrote:
> zIPL boot menu entries can be non-sequential. Let's account
> for this issue for the s390 enumerated boot menu. Since we
> can no longer print a range of available entries to the
> user, we have to present a list of each available entry.
>
> An example of this menu:
>
> s390-ccw Enumerated Boot Menu.
>
> [0] default
>
> [1]
> [2]
> [7]
> [8]
> [9]
> [11]
> [12]
>
> Please choose:
>
> Signed-off-by: Collin Walling <address@hidden>
> Reported-by: Vasily Gorbik <address@hidden>
> ---
> pc-bios/s390-ccw/bootmap.c | 12 +++++++-----
> pc-bios/s390-ccw/menu.c | 29 ++++++++++++++++++++---------
> pc-bios/s390-ccw/s390-ccw.h | 2 +-
> 3 files changed, 28 insertions(+), 15 deletions(-)
>
> diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
> index 2f79346..f9a2fb3 100644
> --- a/pc-bios/s390-ccw/bootmap.c
> +++ b/pc-bios/s390-ccw/bootmap.c
> @@ -558,6 +558,8 @@ static void ipl_scsi(void)
> int program_table_entries = 0;
> BootMapTable *prog_table = (void *)sec;
> unsigned int loadparm = get_loadparm_index();
> + bool valid_entries[MAX_BOOT_ENTRIES] = {false};
> + size_t i;
>
> /* Grab the MBR */
> memset(sec, FREE_SPACE_FILLER, sizeof(sec));
> @@ -578,18 +580,18 @@ static void ipl_scsi(void)
> read_block(mbr->pt.blockno, sec, "Error reading Program Table");
> IPL_assert(magic_match(sec, ZIPL_MAGIC), "No zIPL magic in PT");
>
> - while (program_table_entries < MAX_BOOT_ENTRIES) {
> - if (!prog_table->entry[program_table_entries].scsi.blockno) {
> - break;
> + for (i = 0; i < MAX_BOOT_ENTRIES; i++) {
> + if (prog_table->entry[i].scsi.blockno) {
> + valid_entries[i] = true;
> + program_table_entries++;
> }
> - program_table_entries++;
> }
>
> 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);
> + loadparm = menu_get_enum_boot_index(valid_entries);
> }
>
> debug_print_int("loadparm", loadparm);
> diff --git a/pc-bios/s390-ccw/menu.c b/pc-bios/s390-ccw/menu.c
> index 083405f..2f11a51 100644
> --- a/pc-bios/s390-ccw/menu.c
> +++ b/pc-bios/s390-ccw/menu.c
> @@ -225,19 +225,30 @@ int menu_get_zipl_boot_index(const char *menu_data)
> return get_boot_index(valid_entries);
> }
>
> -
> -int menu_get_enum_boot_index(int entries)
> +int menu_get_enum_boot_index(bool *valid_entries)
> {
> - char tmp[4];
> + char tmp[3];
> + int i;
>
> - sclp_print("s390x Enumerated Boot Menu.\n\n");
> + sclp_print("s390-ccw 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");
> + for (i = 0; i < MAX_BOOT_ENTRIES; i++) {
> + if (valid_entries[i]) {
> + if (i < 10) {
> + sclp_print(" ");
> + }
> + sclp_print("[");
> + sclp_print(uitoa(i, tmp, sizeof(tmp)));
> + sclp_print("]");
> + if (i == 0) {
> + sclp_print(" default\n");
> + }
> + sclp_print("\n");
> + }
> + }
>
> - return get_boot_index(entries);
> + sclp_print("\n");
> + return get_boot_index(valid_entries);
> }
>
> void menu_set_parms(uint8_t boot_menu_flag, uint32_t boot_menu_timeout)
> diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
> index 2c9e601..a1bdb4c 100644
> --- a/pc-bios/s390-ccw/s390-ccw.h
> +++ b/pc-bios/s390-ccw/s390-ccw.h
> @@ -91,7 +91,7 @@ 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);
> +int menu_get_enum_boot_index(bool *valid_entries);
> bool menu_is_enabled_enum(void);
>
> #define MAX_BOOT_ENTRIES 31
>
Reviewed-by: Thomas Huth <address@hidden>
[qemu-s390x] [PATCH 4/4] pc-bios/s390-ccw: fix non-sequential boot entries (enum), Collin Walling, 2018/04/10
- Re: [qemu-s390x] [PATCH 4/4] pc-bios/s390-ccw: fix non-sequential boot entries (enum),
Thomas Huth <=
[qemu-s390x] [PATCH 3/4] pc-bios/s390-ccw: fix non-sequential boot entries (eckd), Collin Walling, 2018/04/10