Re: [Xen-devel] [PATCH for-next 4/5] tools: load IPXE from standalone file

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 15.05.18 at 20:22, <wei.liu2@xxxxxxxxxx> wrote:
> @@ -95,13 +97,17 @@ static void rombios_load_roms(void)
>      etherboot_phys_addr = VGABIOS_PHYSICAL_ADDRESS + vgabios_sz;
>      if ( etherboot_phys_addr < OPTIONROM_PHYSICAL_ADDRESS )
>          etherboot_phys_addr = OPTIONROM_PHYSICAL_ADDRESS;
> -    etherboot_sz = scan_etherboot_nic(OPTIONROM_PHYSICAL_END,
> -                                      etherboot_phys_addr,
> -                                      etherboot);
>  
> -    option_rom_phys_addr = etherboot_phys_addr + etherboot_sz;
> -    option_rom_sz = pci_load_option_roms(OPTIONROM_PHYSICAL_END,
> -                                         option_rom_phys_addr);
> +    if ( ipxe_module_addr )
> +    {
> +        etherboot_sz = scan_etherboot_nic(OPTIONROM_PHYSICAL_END,
> +                                          etherboot_phys_addr,
> +                                          ipxe_module_addr);
> +
> +        option_rom_phys_addr = etherboot_phys_addr + etherboot_sz;
> +        option_rom_sz = pci_load_option_roms(OPTIONROM_PHYSICAL_END,
> +                                             option_rom_phys_addr);
> +    }

I guess you want to alter existing logic as little as possible, hence you
don't want to leverage the fact that you (could) get the size passed ...

> @@ -133,6 +139,9 @@ static void rombios_load(const struct bios_config *config,
>  
>      info = (struct rombios_info *)BIOS_INFO_PHYSICAL_ADDRESS;
>      info->bios32_entry = bioshigh;
> +
> +    /* Stash ipxe address */
> +    ipxe_module_addr = ipxe_addr;
>  }

... here (but you ignore it). If the size was used, scan_option_rom() could be
made not even look at non-option-ROMs.

But on the basis that you simply retain existing functionality
Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
for the hvmloader parts.

Jan



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel