From: fu.wei@linaro.org
To: grub-devel@gnu.org, arvidjaar@gmail.com, phcoder@gmail.com
Cc: xen-devel@lists.xensource.com, Ian.Campbell@citrix.com,
jcm@redhat.com, julien.grall@linaro.org,
leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org,
Fu Wei <fu.wei@linaro.org>
Subject: [PATCH v3 2/4] arm64: add "--nounzip" option support in xen_module command
Date: Fri, 26 Feb 2016 19:13:29 +0800 [thread overview]
Message-ID: <1456485211-32695-3-git-send-email-fu.wei@linaro.org> (raw)
In-Reply-To: <1456485211-32695-1-git-send-email-fu.wei@linaro.org>
From: Fu Wei <fu.wei@linaro.org>
This patch adds "--nounzip" option support in order to
be compatible with the module command of i386, then we can
simplify grub-mkconfig support code.
Signed-off-by: Fu Wei <fu.wei@linaro.org>
---
grub-core/loader/arm64/xen_boot.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c
index 8ae43d7..d63e631 100644
--- a/grub-core/loader/arm64/xen_boot.c
+++ b/grub-core/loader/arm64/xen_boot.c
@@ -20,6 +20,7 @@
#include <grub/charset.h>
#include <grub/command.h>
#include <grub/err.h>
+#include <grub/env.h>
#include <grub/file.h>
#include <grub/fdt.h>
#include <grub/list.h>
@@ -379,6 +380,20 @@ 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)
+ {
+ grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
+ goto fail;
+ }
+
+ if (grub_strcmp (argv[0], "--nounzip") == 0)
+ {
+ argv++;
+ argc--;
+ nounzip = 1;
+ }
if (!argc)
{
@@ -403,6 +418,8 @@ 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;
--
2.5.0
next prev parent reply other threads:[~2016-02-26 11:13 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-26 11:13 [PATCH v3 0/4] arm64,xen: add xen_boot support into grup-mkconfig fu.wei
2016-02-26 11:13 ` [PATCH v3 1/4] i386, xen: Add xen_hypervisor and xen_module aliases for i386 fu.wei
2016-02-26 11:13 ` fu.wei [this message]
2016-02-26 11:13 ` [PATCH v3 3/4] * util/grub.d/20_linux_xen.in: Add xen_boot command support fu.wei
2016-02-26 11:13 ` [PATCH v3 4/4] arm64: update the introduction of xen boot commands in docs/grub.texi fu.wei
2016-02-27 17:26 ` Andrei Borzenkov
2016-02-27 17:44 ` Fu Wei
2016-03-07 8:22 ` Fu Wei
2016-03-08 7:54 ` Andrei Borzenkov
2016-03-08 16:37 ` Fu Wei
2016-03-08 17:09 ` Andrei Borzenkov
2016-03-09 8:10 ` Julien Grall
2016-03-09 8:22 ` [Xen-devel] " Fu Wei
2016-03-18 7:53 ` Fu Wei
2016-04-13 9:56 ` Fu Wei
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=1456485211-32695-3-git-send-email-fu.wei@linaro.org \
--to=fu.wei@linaro.org \
--cc=Ian.Campbell@citrix.com \
--cc=arvidjaar@gmail.com \
--cc=grub-devel@gnu.org \
--cc=jcm@redhat.com \
--cc=julien.grall@linaro.org \
--cc=leif.lindholm@linaro.org \
--cc=linaro-uefi@lists.linaro.org \
--cc=phcoder@gmail.com \
--cc=xen-devel@lists.xensource.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).