From patchwork Sun May 14 07:43:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fu Wei Fu X-Patchwork-Id: 99757 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1038012qge; Sun, 14 May 2017 00:44:47 -0700 (PDT) X-Received: by 10.107.27.21 with SMTP id b21mr282804iob.65.1494747887401; Sun, 14 May 2017 00:44:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494747887; cv=none; d=google.com; s=arc-20160816; b=KozGPuvSN6sMguvQvz1ZDYESwIwUBCIGhbMlc+UI0V9To7b0mZxBGUJcRZa/PKs7xO Ad+tNXqTFHgOl2er5pqxp2zTt/MfVfXpmrekY1FIDL2u554ErRMD6FadVuezv+RBSbse JUJcKvBl5Uffm06Yb3AewvC+hPfi4x+7JxABfWU4R7QPUyEkOwf+6AvCEVjl2kxedbka en12u1W4Dz9OiQZVuw1FsnjR0M8WaNV8rLJ5K7uWrro/TLnWKyl5uLyxivSIouZEIDP6 OoL0qajXJvMD8J7E1tM9u+YiKt99/8pULuv4cX9bK3rRPNtGw0yCUXbC+tpmv0xtVJ4W 8KkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-filter:dmarc-filter:delivered-to :arc-authentication-results; bh=/rzRQz7FCupyLNMCCO40rWXCg5BIPGSzfI0GullJfPI=; b=myAFks1h/FZOA62e0wUFnrLxSfvqubAAFEzhMgFMNxIOIGcKgbUGcXm837O7LYIU23 0Qh5I30xBcu60VmvQPQ3L76emqZSUwDZsfOBDujdQG9niPZfiQ6lommi3ukXbmbalP3L nV+7s+/tSE3FzNMEXn4FqJdTi6ivdUwc/6xEPyQnFo4b/K5cDU9nSYlAi7SvJCBJKUrz luEpQBsmjzqYBorkoU44B4vX8Kbvtwr1Fh6s2vvB3noTcUY7oRRPBQubjW2gzLTz+/lB 8TGMeACknzSgJ1kAnVUxfImnvEw0YCSz4Z19pcKCIwwZdaidIL2C84MNx9RjhQPa4OO6 /leQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id b8si7472657ioj.102.2017.05.14.00.44.47; Sun, 14 May 2017 00:44:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id E3FAC60A3C; Sun, 14 May 2017 07:44:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id F14E4608B6; Sun, 14 May 2017 07:44:41 +0000 (UTC) X-Original-To: linaro-uefi@lists.linaro.org Delivered-To: linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 68A8760A34; Sun, 14 May 2017 07:44:39 +0000 (UTC) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by lists.linaro.org (Postfix) with ESMTPS id 4D0FB609E7 for ; Sun, 14 May 2017 07:44:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 34DFF61BBB; Sun, 14 May 2017 07:44:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 34DFF61BBB DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 34DFF61BBB Received: from Rei-Ayanami.localdomain.com (vpn1-4-19.pek2.redhat.com [10.72.4.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 844B117140; Sun, 14 May 2017 07:44:13 +0000 (UTC) From: fu.wei@linaro.org To: dkiper@net-space.pl, grub-devel@gnu.org, arvidjaar@gmail.com, phcoder@gmail.com Date: Sun, 14 May 2017 15:43:45 +0800 Message-Id: <20170514074347.18787-2-fu.wei@linaro.org> In-Reply-To: <20170514074347.18787-1-fu.wei@linaro.org> References: <20170514074347.18787-1-fu.wei@linaro.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Sun, 14 May 2017 07:44:21 +0000 (UTC) Cc: xen-devel@lists.xensource.com, jcm@redhat.com, ian.campbell@docker.com, julien.grall@arm.com, sstabellini@kernel.org, linaro-uefi@lists.linaro.org Subject: [Linaro-uefi] [PATCH v8 1/3] arm64: add "--nounzip" option support in xen_module command X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "For discussions about Linaro-related UEFI development. Not a substitute for edk2-devel." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" From: Fu Wei This patch adds "--nounzip" option support in order to be compatible with the module command of multiboot on other architecture, by this way we can simplify grub-mkconfig support code. This patch also allow us to use zip compressed module(like Linux kernel for Dom0). Signed-off-by: Fu Wei --- grub-core/loader/arm64/xen_boot.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c index a914eb8..2a42654 100644 --- a/grub-core/loader/arm64/xen_boot.c +++ b/grub-core/loader/arm64/xen_boot.c @@ -379,6 +379,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 +417,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; From patchwork Sun May 14 07:43:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fu Wei Fu X-Patchwork-Id: 99758 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1038043qge; Sun, 14 May 2017 00:44:59 -0700 (PDT) X-Received: by 10.36.98.21 with SMTP id d21mr303828itc.78.1494747899094; Sun, 14 May 2017 00:44:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494747899; cv=none; d=google.com; s=arc-20160816; b=A5FQ7UCnQt/UWLX4Huai7AcDpKEpjQDd8uQ65QnO09roH2SWfIziesgUMqvV2C0MsP ZIQfIaKIYHVlQmZaFtgPIeZiE0HO5MakNwQUvx/LQ6fE35vOgyvjf6Ow2fLHweAt82z/ vc9HBj2ZAmQYNAHSAMNxMuegLOqH0hp6Kui3iFPd5Dt2wHn/hrg8rZ5iaCzgPKrGpbg+ ox24qQodwJ9GKu768iyHca1cXTE9u8w6kZqLtvq7gFfqiVfbwbZktsYbhguno5DfAaz4 LUIz0FBAmUOJ8XXSqSA2w4PnwnvOI7IkrhVAkx39HNnmrg+mc0RClqgIltPbiuqT3UsV +2bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-filter:dmarc-filter:delivered-to :arc-authentication-results; bh=W7fEw20jg9Hpits15QtpLtxqQBVzgbdyUy4gwJkqUc4=; b=b7tHLPt5k8YRQU8/JL5SL7Vm9DV8NgE7h+9vxFr/FrVxOYQNTylqQxrhTt7BGZriiM viE9GEHkWxqT6WYzYgH2LZpbjYOZSNWA/d5dpA/g1s+5N1z4FMP1pZT8V1RnSZ3RSNUJ ozrdkeWBrhydbeOvqYf3v4ZbA68AgWlGSmahB2p767qvRziZtT6q+wswih8J9PqOXnG3 xfDbC5+vWiKPrsTRkmurKG4BZ/OEbEHsRJ1uoHxrlzSitaP997vPri9j2s5fx30LXdbK AdMbCeHvgPCUKbTO1+hpYd7Z+wA5y03cDHv9WNri12RxxWixwUPRuwOyCUPq95mKMeQF 38pg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id e93si6575914itd.56.2017.05.14.00.44.58; Sun, 14 May 2017 00:44:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id A368B609ED; Sun, 14 May 2017 07:44:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 3BDB9609F2; Sun, 14 May 2017 07:44:42 +0000 (UTC) X-Original-To: linaro-uefi@lists.linaro.org Delivered-To: linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 7FF99609F2; Sun, 14 May 2017 07:44:39 +0000 (UTC) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by lists.linaro.org (Postfix) with ESMTPS id 3199B60816 for ; Sun, 14 May 2017 07:44:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0672D811A7; Sun, 14 May 2017 07:44:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0672D811A7 DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 0672D811A7 Received: from Rei-Ayanami.localdomain.com (vpn1-4-19.pek2.redhat.com [10.72.4.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 15FC017140; Sun, 14 May 2017 07:44:21 +0000 (UTC) From: fu.wei@linaro.org To: dkiper@net-space.pl, grub-devel@gnu.org, arvidjaar@gmail.com, phcoder@gmail.com Date: Sun, 14 May 2017 15:43:46 +0800 Message-Id: <20170514074347.18787-3-fu.wei@linaro.org> In-Reply-To: <20170514074347.18787-1-fu.wei@linaro.org> References: <20170514074347.18787-1-fu.wei@linaro.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Sun, 14 May 2017 07:44:30 +0000 (UTC) Cc: xen-devel@lists.xensource.com, jcm@redhat.com, ian.campbell@docker.com, julien.grall@arm.com, sstabellini@kernel.org, linaro-uefi@lists.linaro.org Subject: [Linaro-uefi] [PATCH v8 2/3] * util/grub.d/20_linux_xen.in: Add xen_boot command support for aarch64 X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "For discussions about Linaro-related UEFI development. Not a substitute for edk2-devel." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" From: Fu Wei This patch adds the support of xen_boot command for aarch64: xen_hypervisor xen_module These two commands are only for aarch64, since it has its own protocol and commands to boot xen hypervisor and Dom0, but not multiboot. For other architectures, they are still using multiboot and module commands. Signed-off-by: Fu Wei --- util/grub.d/20_linux_xen.in | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in index c48af94..c002fc9 100644 --- a/util/grub.d/20_linux_xen.in +++ b/util/grub.d/20_linux_xen.in @@ -122,16 +122,16 @@ linux_entry () else xen_rm_opts="no-real-mode edd=off" fi - multiboot ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts} + ${xen_loader} ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts} echo '$(echo "$lmessage" | grub_quote)' - module ${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args} + ${module_loader} ${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args} EOF if test -n "${initrd}" ; then # TRANSLATORS: ramdisk isn't identifier. Should be translated. message="$(gettext_printf "Loading initial ramdisk ...")" sed "s/^/$submenu_indentation/" << EOF echo '$(echo "$message" | grub_quote)' - module --nounzip ${rel_dirname}/${initrd} + ${module_loader} --nounzip ${rel_dirname}/${initrd} EOF fi sed "s/^/$submenu_indentation/" << EOF @@ -206,6 +206,14 @@ while [ "x${xen_list}" != "x" ] ; do if [ "x$is_top_level" != xtrue ]; then echo " submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {" fi + $grub_file --is-arm64-efi $current_xen + if [ $? -ne 0 ]; then + xen_loader="multiboot" + module_loader="module" + else + xen_loader="xen_hypervisor" + module_loader="xen_module" + fi while [ "x$list" != "x" ] ; do linux=`version_find_latest $list` gettext_printf "Found linux image: %s\n" "$linux" >&2 From patchwork Sun May 14 07:43:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fu Wei Fu X-Patchwork-Id: 99759 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1038113qge; Sun, 14 May 2017 00:45:14 -0700 (PDT) X-Received: by 10.107.138.193 with SMTP id c62mr346137ioj.32.1494747914238; Sun, 14 May 2017 00:45:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494747914; cv=none; d=google.com; s=arc-20160816; b=TG/2VxjPJmY2u6LMycw6xGMCBqANMs/tU65ktLdmVko1BdQuK3mGgchdEZdoEC53as jqtX50XfUE3OB8osPt/UpfzmU7ciqBeN2bXI8a5VaM0MYYiSEJVHWUaF3g+AA20hX0Oh c/kVJvTWIkjyxhfEaTT/eYsSmMd15Y1GGE80ZdWOVyaUoEdgqv219bBtdLHUPrQo8E+6 RU314W/ibUeXoFu3VJq+0CBeJbgt+wopqD+otbkSI8VtgdMYJXBDSmDuTUvfDrT2hObS rq6vtEgGw3T0IXa2AE0Npj+oAbobKyDyQXML8EBdKxrzViM/jC5js70EcVWzWhSll2F1 PmCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-filter:dmarc-filter:delivered-to :arc-authentication-results; bh=QBmwCKOaZdgEcqS8GoAcx8X0DiewNzpIaZ5v+qgQZJg=; b=H5a88/B2x2onfpzHnG7XRrnxoFQplWKFGGMhZ5c4bZ17LJomeAipPwL/0Mef2buuaN CI65s72EqVhlHUYyDYlRAJ68YMNGmwvxtqqfPQr36wFlxg/yd1TZmBXg03UYRGeJx+Sz n95U8dUKTIqn5UdeC/szhtQziSB9FQVCgZLi1/q7y8jS+0S236/rJsasnXk+3Gwc+dNy sumdGNpXvIl3Bi9Zj+IRBQBFAAwr9hCjkFPYDfXWQpPXA/oDQRXCwXsbjlDlU7aC4JmY TYVI6VSfvTFxkU2PCKlQAOvQW9zuXabvvaoTb3IMmro7M61zU6FBqZn+THE1ZggqEj0/ PSSQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id f138si4886478itc.122.2017.05.14.00.45.13; Sun, 14 May 2017 00:45:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id C4647609FE; Sun, 14 May 2017 07:45:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 8AF86609F5; Sun, 14 May 2017 07:44:45 +0000 (UTC) X-Original-To: linaro-uefi@lists.linaro.org Delivered-To: linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id BF05C609E7; Sun, 14 May 2017 07:44:40 +0000 (UTC) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by lists.linaro.org (Postfix) with ESMTPS id 70C88608B6 for ; Sun, 14 May 2017 07:44:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7AF2581240; Sun, 14 May 2017 07:44:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7AF2581240 DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 7AF2581240 Received: from Rei-Ayanami.localdomain.com (vpn1-4-19.pek2.redhat.com [10.72.4.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0521217140; Sun, 14 May 2017 07:44:30 +0000 (UTC) From: fu.wei@linaro.org To: dkiper@net-space.pl, grub-devel@gnu.org, arvidjaar@gmail.com, phcoder@gmail.com Date: Sun, 14 May 2017 15:43:47 +0800 Message-Id: <20170514074347.18787-4-fu.wei@linaro.org> In-Reply-To: <20170514074347.18787-1-fu.wei@linaro.org> References: <20170514074347.18787-1-fu.wei@linaro.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Sun, 14 May 2017 07:44:37 +0000 (UTC) Cc: xen-devel@lists.xensource.com, jcm@redhat.com, ian.campbell@docker.com, julien.grall@arm.com, sstabellini@kernel.org, linaro-uefi@lists.linaro.org Subject: [Linaro-uefi] [PATCH v8 3/3] arm64: update the introduction of xen boot commands in docs/grub.texi X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "For discussions about Linaro-related UEFI development. Not a substitute for edk2-devel." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" From: Fu Wei delete: xen_linux, xen_initrd, xen_xsm add: xen_module This update bases on commit 0edd750e50698854068358ea53528100a9192902 Author: Vladimir Serbinenko Date: Fri Jan 22 10:18:47 2016 +0100 xen_boot: Remove obsolete module type distinctions. Also bases on the module loading mechanism of Xen code: 488c2a8 docs/arm64: clarify the documention for loading XSM support 67831c4 docs/arm64: update the documentation for loading XSM support ca32012 xen/arm64: check XSM Magic from the second unknown module. Signed-off-by: Fu Wei Reviewed-by: Julien Grall --- docs/grub.texi | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/docs/grub.texi b/docs/grub.texi index e935af3..a0c4b9e 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -3873,11 +3873,9 @@ you forget a command, you can run the command @command{help} @comment * vbeinfo:: List available video modes * verify_detached:: Verify detached digital signature * videoinfo:: List available video modes -@comment * xen_*:: Xen boot commands -* xen_hypervisor:: Load xen hypervisor binary -* xen_linux:: Load dom0 kernel for xen hypervisor -* xen_initrd:: Load dom0 initrd for dom0 kernel -* xen_xsm:: Load xen security module for xen hypervisor +@comment * xen_*:: Xen boot commands for AArch64 +* xen_hypervisor:: Load xen hypervisor binary (only on AArch64) +* xen_module:: Load xen modules for xen hypervisor (only on AArch64) @end menu @@ -5153,32 +5151,22 @@ List available video modes. If resolution is given, show only matching modes. Load a Xen hypervisor binary from @var{file}. The rest of the line is passed verbatim as the @dfn{kernel command-line}. Any other binaries must be reloaded after using this command. +This command is only available on AArch64 systems. @end deffn -@node xen_linux -@subsection xen_linux +@node xen_module +@subsection xen_module -@deffn Command xen_linux file [arguments] -Load a dom0 kernel image for xen hypervisor at the booting process of xen. +@deffn Command xen_module [--nounzip] file [arguments] +Load a module for xen hypervisor at the booting process of xen. The rest of the line is passed verbatim as the module command line. +Modules should be loaded in the following order: + - dom0 kernel image + - dom0 ramdisk if present + - XSM policy if present +This command is only available on AArch64 systems. @end deffn -@node xen_initrd -@subsection xen_initrd - -@deffn Command xen_initrd file -Load a initrd image for dom0 kernel at the booting process of xen. -@end deffn - -@node xen_xsm -@subsection xen_xsm - -@deffn Command xen_xsm file -Load a xen security module for xen hypervisor at the booting process of xen. -See @uref{http://wiki.xen.org/wiki/XSM} for more detail. -@end deffn - - @node Networking commands @section The list of networking commands