From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1bRyRK-0007xe-SE for mharc-grub-devel@gnu.org; Tue, 26 Jul 2016 05:14:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51062) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bRyRI-0007w4-Js for grub-devel@gnu.org; Tue, 26 Jul 2016 05:14:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bRyRH-0005BX-Hn for grub-devel@gnu.org; Tue, 26 Jul 2016 05:14:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60249) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bRyRH-0005BS-By for grub-devel@gnu.org; Tue, 26 Jul 2016 05:14:11 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A0B453B716; Tue, 26 Jul 2016 09:14:10 +0000 (UTC) Received: from rei-ayanami.redhat.com (vpn1-6-159.pek2.redhat.com [10.72.6.159]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6Q9Du0O028034; Tue, 26 Jul 2016 05:14:06 -0400 From: fu.wei@linaro.org To: grub-devel@gnu.org, arvidjaar@gmail.com, phcoder@gmail.com Cc: linaro-uefi@lists.linaro.org, Ian.Campbell@citrix.com, julien.grall@arm.com, xen-devel@lists.xensource.com, jcm@redhat.com, leif.lindholm@linaro.org, sstabellini@kernel.org, Fu Wei Subject: [PATCH v6 2/4] arm64: add "--nounzip" option support in xen_module command Date: Tue, 26 Jul 2016 17:13:41 +0800 Message-Id: <1469524423-7082-3-git-send-email-fu.wei@linaro.org> In-Reply-To: <1469524423-7082-1-git-send-email-fu.wei@linaro.org> References: <1469524423-7082-1-git-send-email-fu.wei@linaro.org> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Tue, 26 Jul 2016 09:14:10 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jul 2016 09:14:13 -0000 From: Fu Wei 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 --- 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 a914eb8..0878364 100644 --- a/grub-core/loader/arm64/xen_boot.c +++ b/grub-core/loader/arm64/xen_boot.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -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.5