fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pc-bios/s390-ccw: Allow up to 31 entries for pxelinux.cfg

Browse source 
We're going to support a menu for the pxelinux.cfg code, and to be able
to reuse some functionality from menu.c, we should align the maximum
amount of possible entries with the MAX_BOOT_ENTRIES constant that is
used there. Thus replace MAX_PXELINUX_ENTRIES with MAX_BOOT_ENTRIES.

Reviewed-by: Jared Rossi <jrossi@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250709083443.41574-3-thuth@redhat.com>
This commit is contained in:
Thomas Huth 2025-07-09 10:34:40 +02:00
parent a4adf071dc
commit 108977796f
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pc-bios/s390-ccw/netmain.c
View file

@ -353,17 +353,15 @@ static int net_select_and_load_kernel(filename_ip_t *fn_ip,
return load_kernel_with_initrd(fn_ip, &entries[selected]);
}
#define MAX_PXELINUX_ENTRIES 16
static int net_try_pxelinux_cfg(filename_ip_t *fn_ip)
{
struct pl_cfg_entry entries[MAX_PXELINUX_ENTRIES];
struct pl_cfg_entry entries[MAX_BOOT_ENTRIES];
int num_ent, def_ent = 0;
num_ent = pxelinux_load_parse_cfg(fn_ip, mac, get_uuid(),
DEFAULT_TFTP_RETRIES,
cfgbuf, sizeof(cfgbuf),
entries, MAX_PXELINUX_ENTRIES, &def_ent);
entries, MAX_BOOT_ENTRIES, &def_ent);
return net_select_and_load_kernel(fn_ip, num_ent, def_ent, entries);
}
@ -446,11 +444,11 @@ static int net_try_direct_tftp_load(filename_ip_t *fn_ip)
* a magic comment string.
*/
if (!strncasecmp("# pxelinux", cfgbuf, 10)) {
struct pl_cfg_entry entries[MAX_PXELINUX_ENTRIES];
struct pl_cfg_entry entries[MAX_BOOT_ENTRIES];
int num_ent, def_ent = 0;
num_ent = pxelinux_parse_cfg(cfgbuf, sizeof(cfgbuf), entries,
MAX_PXELINUX_ENTRIES, &def_ent);
MAX_BOOT_ENTRIES, &def_ent);
return net_select_and_load_kernel(fn_ip, num_ent, def_ent,
entries);
}