motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 17:23:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

pc-bios/s390-ccw: fix non-sequential boot entries (enum)

Browse source 
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 <walling@linux.ibm.com>
Reported-by: Vasily Gorbik <gor@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Collin Walling 2018-04-16 12:56:10 -04:00 • committed by Thomas Huth
parent 7385e947fc
commit 622b391780
3 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
pc-bios/s390-ccw/menu.c
View file

@ -228,19 +228,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)