All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lee Jones <lee.jones@linaro.org>
To: Daniel Kiper <dkiper@net-space.pl>
Cc: Fu Wei Fu <fu.wei@linaro.org>,
	Leif Lindholm <leif.lindholm@linaro.org>,
	The development of GNU GRUB <grub-devel@gnu.org>,
	Julien Grall <julien.grall@arm.com>
Subject: arm64/xen: Fix implicit declaration of function ‘grub_file_filter_disable_compression
Date: Tue, 20 Nov 2018 10:46:56 +0000	[thread overview]
Message-ID: <20181120104656.GN3513@dell> (raw)
In-Reply-To: <20181116140737.wuox7v63y6lt2ymt@tomti.i.net-space.pl>

From: Lee Jones <lee.jones@linaro.org>

arm64/xen: Fix implicit declaration of function ‘grub_file_filter_disable_compression
    
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 <lee.jones@linaro.org>

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);


  parent reply	other threads:[~2018-11-20 13:36 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-14 19:29 [PATCH 0/5] Fix non-x86 builds after verifiers framework merged Leif Lindholm
2018-11-14 19:29 ` [PATCH 1/5] grub/verify.h: add include guard Leif Lindholm
2018-11-14 19:29 ` [PATCH 2/5] file.h: add device tree file type Leif Lindholm
2018-11-14 19:29 ` [PATCH 3/5] loader/efi/fdt.c: fixup grub_file_open call Leif Lindholm
2018-11-14 19:29 ` [PATCH 4/5] arm64/efi: fix breakage caused by verifiers Leif Lindholm
2018-11-14 19:29 ` [PATCH 5/5] arm-uboot, ia64, sparc64: fix up grub_file_open calls Leif Lindholm
2018-11-16  2:31 ` [PATCH 0/5] Fix non-x86 builds after verifiers framework merged Fu Wei Fu
2018-11-16 14:07   ` Daniel Kiper
2018-11-20 10:45     ` arm64/xen: Fix too few arguments to function ‘grub_create_loader_cmdline’ Lee Jones
2018-11-20 11:12       ` Julien Grall
2018-11-21 14:12       ` Daniel Kiper
2018-11-22  7:26         ` Lee Jones
2018-11-20 10:46     ` Lee Jones [this message]
2018-11-20 11:00       ` arm64/xen: Fix implicit declaration of function ‘grub_file_filter_disable_compression Julien Grall
2018-11-20 11:22         ` Lee Jones
2018-11-20 11:56           ` Julien Grall
2018-11-20 12:26             ` Lee Jones
2018-11-20 11:38       ` [PATCH v2] " Lee Jones
2018-11-20 12:35         ` [PATCH v3 (part 1)] arm64/xen: Fix implicit declaration of function ‘grub_file_filter_disable_compression' Lee Jones
2018-11-21 14:59           ` Daniel Kiper
2018-11-20 12:37         ` [PATCH v3 (part 2)] generic/blocklist: " Lee Jones
2018-11-20 18:55           ` Vladimir 'phcoder' Serbinenko
2018-11-21 14:14           ` Daniel Kiper
2018-11-20 10:48     ` arm64/xen: Fix too few arguments to function ‘grub_file_open’ Lee Jones
2018-11-20 11:05       ` Julien Grall
2018-11-20 11:20         ` Lee Jones
2018-11-20 11:39       ` [PATCH v2] " Lee Jones
2018-11-21 14:57         ` Daniel Kiper
2018-11-20 11:37     ` arm64/xen: Remove duplicate check for arguments Lee Jones
2018-11-20 18:54       ` Vladimir 'phcoder' Serbinenko
2018-11-16 14:05 ` [PATCH 0/5] Fix non-x86 builds after verifiers framework merged Daniel Kiper
2018-11-16 15:20   ` Leif Lindholm

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181120104656.GN3513@dell \
    --to=lee.jones@linaro.org \
    --cc=dkiper@net-space.pl \
    --cc=fu.wei@linaro.org \
    --cc=grub-devel@gnu.org \
    --cc=julien.grall@arm.com \
    --cc=leif.lindholm@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.