Re: [PATCH v2] arm64/xen: Fix too few arguments to function ‘grub_file_open’

[Daniel Kiper]

On Tue, Nov 20, 2018 at 11:39:42AM +0000, Lee Jones wrote:
> From: Lee Jones <address@hidden>
>
> arm64/xen: Fix too few arguments to function ‘grub_file_open’
>
> Without this fix xen_boot.c omits:
>
> loader/arm64/xen_boot.c: In function ‘grub_cmd_xen_module’:
> loader/arm64/xen_boot.c:424:10: error: too few arguments to function 
> ‘grub_file_open’
>    file = grub_file_open (argv[0]);
>           ^~~~~~~~~~~~~~
> In file included from ../include/grub/cache.h:23:0,
>                  from loader/arm64/xen_boot.c:19:
> ../include/grub/file.h:204:25: note: declared here
>  grub_file_t EXPORT_FUNC(grub_file_open) (const char *name, enum 
> grub_file_type type);
>                          ^
> ../include/grub/symbol.h:68:25: note: in definition of macro ‘EXPORT_FUNC’
>  # define EXPORT_FUNC(x) x
>                          ^
> loader/arm64/xen_boot.c: In function ‘grub_cmd_xen_hypervisor’:
> loader/arm64/xen_boot.c:456:10: error: too few arguments to function 
> ‘grub_file_open’
>    file = grub_file_open (argv[0]);
>           ^~~~~~~~~~~~~~
>
> Signed-off-by: Lee Jones <address@hidden>
>
> diff --git a/grub-core/loader/arm64/xen_boot.c 
> b/grub-core/loader/arm64/xen_boot.c
> index 117293fb9..1b1dd8c65 100644
> --- a/grub-core/loader/arm64/xen_boot.c
> +++ b/grub-core/loader/arm64/xen_boot.c
> @@ -427,7 +427,7 @@ grub_cmd_xen_module (grub_command_t cmd 
> __attribute__((unused)),
>
>    grub_dprintf ("xen_loader", "Init module and node info\n");
>
> -  file = grub_file_open (argv[0]);
> +  file = grub_file_open (argv[0], GRUB_FILE_TYPE_LINUX_KERNEL);
>    if (!file)
>      goto fail;
>
> @@ -459,7 +459,7 @@ grub_cmd_xen_hypervisor (grub_command_t cmd __attribute__ 
> ((unused)),
>        goto fail;
>      }
>
> -  file = grub_file_open (argv[0]);
> +  file = grub_file_open (argv[0], GRUB_FILE_TYPE_LINUX_KERNEL);

Please introduce GRUB_FILE_TYPE_XEN_HYPERVISOR and GRUB_FILE_TYPE_XEN_MODULE.
You can put both of them behind GRUB_FILE_TYPE_MULTIBOOT_MODULE.

Daniel