ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pc-bios/s390-ccw/bootmap.c
View File

@ -565,6 +565,8 @@ static void ipl_scsi(void)
int program_table_entries = 0; int program_table_entries = 0;
BootMapTable *prog_table = (void *)sec; BootMapTable *prog_table = (void *)sec;
unsigned int loadparm = get_loadparm_index(); unsigned int loadparm = get_loadparm_index();
bool valid_entries[MAX_BOOT_ENTRIES] = {false};
size_t i;
/* Grab the MBR */ /* Grab the MBR */
memset(sec, FREE_SPACE_FILLER, sizeof(sec)); memset(sec, FREE_SPACE_FILLER, sizeof(sec));
@ -585,18 +587,18 @@ static void ipl_scsi(void)
read_block(mbr->pt.blockno, sec, "Error reading Program Table"); read_block(mbr->pt.blockno, sec, "Error reading Program Table");
IPL_assert(magic_match(sec, ZIPL_MAGIC), "No zIPL magic in PT"); IPL_assert(magic_match(sec, ZIPL_MAGIC), "No zIPL magic in PT");
while (program_table_entries < MAX_BOOT_ENTRIES) { for (i = 0; i < MAX_BOOT_ENTRIES; i++) {
if (!prog_table->entry[program_table_entries].scsi.blockno) { if (prog_table->entry[i].scsi.blockno) {
break; valid_entries[i] = true;
program_table_entries++;
} }
program_table_entries++;
} }
debug_print_int("program table entries", program_table_entries); debug_print_int("program table entries", program_table_entries);
IPL_assert(program_table_entries != 0, "Empty Program Table"); IPL_assert(program_table_entries != 0, "Empty Program Table");
if (menu_is_enabled_enum()) { 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); debug_print_int("loadparm", loadparm);

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); return get_boot_index(valid_entries);
} }
int menu_get_enum_boot_index(bool *valid_entries)
int menu_get_enum_boot_index(int 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))); for (i = 0; i < MAX_BOOT_ENTRIES; i++) {
sclp_print(" entries detected. Select from boot index 0 to "); if (valid_entries[i]) {
sclp_print(uitoa(entries - 1, tmp, sizeof(tmp))); if (i < 10) {
sclp_print(".\n\n"); 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) void menu_set_parms(uint8_t boot_menu_flag, uint32_t boot_menu_timeout)

2
pc-bios/s390-ccw/s390-ccw.h
View File

@ -91,7 +91,7 @@ void zipl_load(void);
void menu_set_parms(uint8_t boot_menu_flag, uint32_t boot_menu_timeout); void menu_set_parms(uint8_t boot_menu_flag, uint32_t boot_menu_timeout);
int menu_get_zipl_boot_index(const char *menu_data); int menu_get_zipl_boot_index(const char *menu_data);
bool menu_is_enabled_zipl(void); 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); bool menu_is_enabled_enum(void);
#define MAX_BOOT_ENTRIES 31 #define MAX_BOOT_ENTRIES 31