Re: [Xen-devel] [PATCH v2 4/6] tools: load IPXE from standalone file

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 25.06.18 at 13:35, <wei.liu2@xxxxxxxxxx> wrote:
> --- a/tools/firmware/hvmloader/config.h
> +++ b/tools/firmware/hvmloader/config.h
> @@ -22,7 +22,8 @@ struct bios_config {
>      /* ROMS */
>      void (*load_roms)(void);
>  
> -    void (*bios_load)(const struct bios_config *config, void *addr, uint32_t 
> size);
> +    void (*bios_load)(const struct bios_config *config, void *addr,
> +                      uint32_t size, void *extra_addr);

Okay, the new parameter is of pointer type.

> --- a/tools/firmware/hvmloader/hvmloader.c
> +++ b/tools/firmware/hvmloader/hvmloader.c
> @@ -363,12 +363,18 @@ int main(void)
>      {
>          uint32_t paddr = bios_module->paddr;
>  
> -        bios->bios_load(bios, (void*)paddr, bios_module->size);
> +        bios->bios_load(bios, (void*)paddr, bios_module->size, 0);

With that, please pass NULL here, and please take the opportunity to
add the missing blank in the cast.

>      }
>  #ifdef ENABLE_ROMBIOS
>      else if ( bios == &rombios_config )
>      {
> -        bios->bios_load(bios, NULL, 0);
> +        const struct hvm_modlist_entry *ipxe;
> +        uint32_t paddr = 0;
> +
> +        ipxe = get_module_entry(hvm_start_info, "ipxe");
> +        if ( ipxe )
> +            paddr = ipxe->paddr;
> +        bios->bios_load(bios, 0, 0, (void*)paddr);

Here you even (wrongly) convert NULL to 0 - please don't, and please
correct the cast's style.


With that hvmloader parts
Acked-by: Jan Beulich <jbeulich@xxxxxxxx>

Jan



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