Reviewed-by: Jared Rossi <jrossi@linux.ibm.com>
On 7/9/25 4:34 AM, Thomas Huth wrote:
> From: Thomas Huth <thuth@redhat.com>
>
> We are going to reuse this function for selecting an entry from
> the pxelinux.cfg menu, so rename this function with a "menu_"
> prefix and make it available globally.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> pc-bios/s390-ccw/s390-ccw.h | 1 +
> pc-bios/s390-ccw/menu.c | 6 +++---
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
> index 6cdce3e5e5b..b1dc35cdedf 100644
> --- a/pc-bios/s390-ccw/s390-ccw.h
> +++ b/pc-bios/s390-ccw/s390-ccw.h
> @@ -87,6 +87,7 @@ int menu_get_zipl_boot_index(const char *menu_data);
> bool menu_is_enabled_zipl(void);
> int menu_get_enum_boot_index(bool *valid_entries);
> bool menu_is_enabled_enum(void);
> +int menu_get_boot_index(bool *valid_entries);
>
> #define MAX_BOOT_ENTRIES 31
>
> diff --git a/pc-bios/s390-ccw/menu.c b/pc-bios/s390-ccw/menu.c
> index 84062e94af4..eeaff78f870 100644
> --- a/pc-bios/s390-ccw/menu.c
> +++ b/pc-bios/s390-ccw/menu.c
> @@ -159,7 +159,7 @@ static void boot_menu_prompt(bool retry)
> }
> }
>
> -static int get_boot_index(bool *valid_entries)
> +int menu_get_boot_index(bool *valid_entries)
> {
> int boot_index;
> bool retry = false;
> @@ -224,7 +224,7 @@ int menu_get_zipl_boot_index(const char *menu_data)
> }
>
> printf("\n");
> - return get_boot_index(valid_entries);
> + return menu_get_boot_index(valid_entries);
> }
>
> int menu_get_enum_boot_index(bool *valid_entries)
> @@ -247,7 +247,7 @@ int menu_get_enum_boot_index(bool *valid_entries)
> }
>
> printf("\n");
> - return get_boot_index(valid_entries);
> + return menu_get_boot_index(valid_entries);
> }
>
> void menu_set_parms(uint8_t boot_menu_flag, uint32_t boot_menu_timeout)