Re: arm64/xen: Fix implicit declaration of function ‘grub_file_filter_disable_compression

[Julien Grall]

Hi,

On 20/11/2018 10:46, Lee Jones wrote:
> From: Lee Jones <address@hidden>
>
> arm64/xen: Fix implicit declaration of function 
> ‘grub_file_filter_disable_compression

This patch seems to drop support for --nounzip. Can you explain why?

Note that the option added on Arm64 to keep the compatibility with x86 multiboot 
loading.

Cheers,

>      
> Without this fix, building xen_boot.c omits:
>      
> loader/arm64/xen_boot.c:433:5: error: implicit declaration of function ‘grub_file_filter_disable_compression’; did you mean ‘grub_file_filter_unregister’? [-Werror=implicit-function-declaration]
>       grub_file_filter_disable_compression ();
>       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>       grub_file_filter_unregister
> loader/arm64/xen_boot.c:433:5: error: nested extern declaration of 
> ‘grub_file_filter_disable_compression’ [-Werror=nested-externs]
>
> 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 33a855df4..5820412e8 100644
> --- a/grub-core/loader/arm64/xen_boot.c
> +++ b/grub-core/loader/arm64/xen_boot.c
> @@ -391,7 +391,6 @@ grub_cmd_xen_module (grub_command_t cmd 
> __attribute__((unused)),
>   
>     struct xen_boot_binary *module = NULL;
>     grub_file_t file = 0;
> -  int nounzip = 0;
>   
>     if (!argc)
>       {
> @@ -399,13 +398,6 @@ grub_cmd_xen_module (grub_command_t cmd 
> __attribute__((unused)),
>         goto fail;
>       }
>   
> -  if (grub_strcmp (argv[0], "--nounzip") == 0)
> -    {
> -      argv++;
> -      argc--;
> -      nounzip = 1;
> -    }
> -
>     if (!argc)
>       {
>         grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
> @@ -429,8 +421,6 @@ grub_cmd_xen_module (grub_command_t cmd 
> __attribute__((unused)),
>   
>     grub_dprintf ("xen_loader", "Init module and node info\n");
>   
> -  if (nounzip)
> -    grub_file_filter_disable_compression ();
>     file = grub_file_open (argv[0]);
>     if (!file)
>       goto fail;
> diff --git a/grub-core/osdep/generic/blocklist.c 
> b/grub-core/osdep/generic/blocklist.c
> index 74024fd06..63e0aed35 100644
> --- a/grub-core/osdep/generic/blocklist.c
> +++ b/grub-core/osdep/generic/blocklist.c
> @@ -59,7 +59,6 @@ grub_install_get_blocklist (grub_device_t root_dev,
>   
>         grub_disk_cache_invalidate_all ();
>   
> -      grub_file_filter_disable_compression ();
>         file = grub_file_open (core_path_dev);
>         if (file)
>         {
> @@ -117,7 +116,6 @@ grub_install_get_blocklist (grub_device_t root_dev,
>   
>     grub_file_t file;
>     /* Now read the core image to determine where the sectors are.  */
> -  grub_file_filter_disable_compression ();
>     file = grub_file_open (core_path_dev);
>     if (! file)
>       grub_util_error ("%s", grub_errmsg);

--
Julien Grall