From patchwork Tue May 10 14:03:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fu.wei@linaro.org X-Patchwork-Id: 9058221 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1F22ABF29F for ; Tue, 10 May 2016 14:06:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 958532015A for ; Tue, 10 May 2016 14:06:13 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 24A2620103 for ; Tue, 10 May 2016 14:06:11 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b08Gl-0006od-V3; Tue, 10 May 2016 14:04:15 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b08Gk-0006nm-Tj for xen-devel@lists.xensource.com; Tue, 10 May 2016 14:04:15 +0000 Received: from [85.158.143.35] by server-1.bemta-6.messagelabs.com id 6B/4E-18833-E5AE1375; Tue, 10 May 2016 14:04:14 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPLMWRWlGSWpSXmKPExsVysWW7jG7sK8N wg5kTjSzuTXnP7sDosb1vF3sAYxRrZl5SfkUCa8bZtj/sBV9FKlbOW8zawPhQoIuRi0NIYDeT xIUd+9kgnBOMEvd7b7J2MXJysAmIS5zp/ApmiwjYSdw9tJMFxGYWOM4ocfu3PogtLBAr0Tt/J VgNi4CqxJ9Hd8BqeAUcJZr/3gazOQWcJNqbz7OD2EJA8SfLr4DFJQS0JZ5fmMwOslhCoI9RYk vDG+YJjDwLGBlWMaoXpxaVpRbpGuslFWWmZ5TkJmbm6BoamOnlphYXJ6an5iQmFesl5+duYgR 6ngEIdjB2/HM6xCjJwaQkyis4xTBciC8pP6UyI7E4I76oNCe1+BCjDAeHkgTv7JdAOcGi1PTU irTMHGAIwqQlOHiURHgzXgCleYsLEnOLM9MhUqcYdTm2LLixlkmIJS8/L1VKnFcaZIYASFFGa R7cCFg8XGKUlRLmZQQ6SoinILUoN7MEVf4VozgHo5IwryXIFJ7MvBK4Ta+AjmACOkKOTR/kiJ JEhJRUA+M6jfWX5k67MvlI5+eXi7uzrFmyOx4bGJ8SOsi+sOP4o9+P+q8fnHRbp1zk88WuB9r FlrMtz/2dHB3YMesfV+/cOQ/afm92mqahMTfV8sHKo7bXU+qylp8z5TbUfrgwLLj93LxL2y0X R310vtH3pZOb/d2MZfbKL17tFWGVNtjcdq5UymJ+oXSpEktxRqKhFnNRcSIAcN43nIICAAA= X-Env-Sender: fu.wei@linaro.org X-Msg-Ref: server-11.tower-21.messagelabs.com!1462889052!13468145!1 X-Originating-IP: [209.132.183.28] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMjA5LjEzMi4xODMuMjggPT4gNTQwNjQ=\n X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21967 invoked from network); 10 May 2016 14:04:13 -0000 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by server-11.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 10 May 2016 14:04:13 -0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (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 EF2CB627DB; Tue, 10 May 2016 14:04:11 +0000 (UTC) Received: from magi-f23.redhat.com (vpn1-7-22.pek2.redhat.com [10.72.7.22]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u4AE3p2P000415; Tue, 10 May 2016 10:04:08 -0400 From: fu.wei@linaro.org To: grub-devel@gnu.org, arvidjaar@gmail.com, phcoder@gmail.com Date: Tue, 10 May 2016 22:03:26 +0800 Message-Id: <1462889006-23671-5-git-send-email-fu.wei@linaro.org> In-Reply-To: <1462889006-23671-1-git-send-email-fu.wei@linaro.org> References: <1462889006-23671-1-git-send-email-fu.wei@linaro.org> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 10 May 2016 14:04:12 +0000 (UTC) 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 Subject: [Xen-devel] [PATCH v4 4/4] arm64: update the introduction of xen boot commands in docs/grub.texi X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- docs/grub.texi | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/docs/grub.texi b/docs/grub.texi index 82f6fa4..df6018a 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -3861,9 +3861,7 @@ you forget a command, you can run the command @command{help} * 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 +* xen_module:: Load xen modules for xen hypervisor @end menu @@ -5141,30 +5139,19 @@ verbatim as the @dfn{kernel command-line}. Any other binaries must be reloaded after using this command. @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: +The 1st module: dom0 kernel image +The 2nd module: dom0 ramdisk (optional, if the ramdisk is present, it must +always be the second module) +If the XSM is present, it can be loaded at any time after the 1st module. @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