xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v4 0/4]  arm64,xen: add xen_boot support into grup-mkconfig
@ 2016-05-10 14:03 fu.wei
  2016-05-10 14:03 ` [PATCH v4 1/4] i386, xen: Add xen_hypervisor and xen_module aliases for i386 fu.wei
                   ` (5 more replies)
  0 siblings, 6 replies; 11+ messages in thread
From: fu.wei @ 2016-05-10 14:03 UTC (permalink / raw)
  To: grub-devel, arvidjaar, phcoder
  Cc: xen-devel, Ian.Campbell, jcm, julien.grall, leif.lindholm,
	linaro-uefi, Fu Wei

From: Fu Wei <fu.wei@linaro.org>

This patchset add xen_boot support into grup-mkconfig for
generating xen boot entrances automatically

Also update the docs/grub.texi for new xen_boot commands.

This patchset has been tested on Foudation model with a bug fix:
http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00205.html

ChangeLog:
v4: http://lists.gnu.org/archive/html/grub-devel/2016-05/
    according to the XSM loading mechanism of Xen(upstreamed),
    update the introduction of xen_module commands in docs/grub.texi

v3: http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00314.html
    reorder the patches
    update the introduction of xen_module commands in docs/grub.texi

v2: http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00282.html
    add "--nounzip" option support in xen_module
    use "feature_xen_boot" instead of "grub_xen_boot"
    update the introduction of xen boot commands in docs/grub.texi

v1 :first upstream patchset:
    http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00264.html

Fu Wei (4):
  i386,xen: Add xen_hypervisor and xen_module aliases for i386
  arm64: add "--nounzip" option support in xen_module command
  * util/grub.d/20_linux_xen.in: Add xen_boot command support
  arm64: update the introduction of xen boot commands in docs/grub.texi

 docs/grub.texi                    | 33 ++++++++++-----------------------
 grub-core/loader/arm64/xen_boot.c | 17 +++++++++++++++++
 grub-core/loader/i386/xen.c       |  7 +++++++
 grub-core/normal/main.c           |  2 +-
 util/grub.d/20_linux_xen.in       | 13 ++++++++++---
 5 files changed, 45 insertions(+), 27 deletions(-)

-- 
2.5.5

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH v4 1/4] i386, xen: Add xen_hypervisor and xen_module aliases for i386
  2016-05-10 14:03 [PATCH v4 0/4] arm64,xen: add xen_boot support into grup-mkconfig fu.wei
@ 2016-05-10 14:03 ` fu.wei
  2016-05-10 14:03 ` [PATCH v4 2/4] arm64: add "--nounzip" option support in xen_module command fu.wei
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 11+ messages in thread
From: fu.wei @ 2016-05-10 14:03 UTC (permalink / raw)
  To: grub-devel, arvidjaar, phcoder
  Cc: xen-devel, Ian.Campbell, jcm, julien.grall, leif.lindholm,
	linaro-uefi, Fu Wei

From: Fu Wei <fu.wei@linaro.org>

Signed-off-by: Fu Wei <fu.wei@linaro.org>
---
 grub-core/loader/i386/xen.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c
index c4d9689..15b0727 100644
--- a/grub-core/loader/i386/xen.c
+++ b/grub-core/loader/i386/xen.c
@@ -689,6 +689,7 @@ fail:
 }
 
 static grub_command_t cmd_xen, cmd_initrd, cmd_module, cmd_multiboot;
+static grub_command_t cmd_xen_hypervisor, cmd_xen_module;
 
 GRUB_MOD_INIT (xen)
 {
@@ -696,10 +697,14 @@ GRUB_MOD_INIT (xen)
 				   0, N_("Load Linux."));
   cmd_multiboot = grub_register_command ("multiboot", grub_cmd_xen,
 					 0, N_("Load Linux."));
+  cmd_xen_hypervisor = grub_register_command ("xen_hypervisor", grub_cmd_xen,
+					      0, N_("Load Linux."));
   cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
 				      0, N_("Load initrd."));
   cmd_module = grub_register_command ("module", grub_cmd_module,
 				      0, N_("Load module."));
+  cmd_xen_module = grub_register_command ("xen_module", grub_cmd_module,
+				      0, N_("Load module."));
   my_mod = mod;
 }
 
@@ -709,4 +714,6 @@ GRUB_MOD_FINI (xen)
   grub_unregister_command (cmd_initrd);
   grub_unregister_command (cmd_multiboot);
   grub_unregister_command (cmd_module);
+  grub_unregister_command (cmd_xen_module);
+  grub_unregister_command (cmd_xen_hypervisor);
 }
-- 
2.5.5

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH v4 2/4] arm64: add "--nounzip" option support in xen_module command
  2016-05-10 14:03 [PATCH v4 0/4] arm64,xen: add xen_boot support into grup-mkconfig fu.wei
  2016-05-10 14:03 ` [PATCH v4 1/4] i386, xen: Add xen_hypervisor and xen_module aliases for i386 fu.wei
@ 2016-05-10 14:03 ` fu.wei
  2016-05-10 14:03 ` [PATCH v4 3/4] * util/grub.d/20_linux_xen.in: Add xen_boot command support fu.wei
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 11+ messages in thread
From: fu.wei @ 2016-05-10 14:03 UTC (permalink / raw)
  To: grub-devel, arvidjaar, phcoder
  Cc: xen-devel, Ian.Campbell, jcm, julien.grall, leif.lindholm,
	linaro-uefi, Fu Wei

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 a914eb8..0878364 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.5

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH v4 3/4] * util/grub.d/20_linux_xen.in: Add xen_boot command support
  2016-05-10 14:03 [PATCH v4 0/4] arm64,xen: add xen_boot support into grup-mkconfig fu.wei
  2016-05-10 14:03 ` [PATCH v4 1/4] i386, xen: Add xen_hypervisor and xen_module aliases for i386 fu.wei
  2016-05-10 14:03 ` [PATCH v4 2/4] arm64: add "--nounzip" option support in xen_module command fu.wei
@ 2016-05-10 14:03 ` fu.wei
  2016-05-10 14:03 ` [PATCH v4 4/4] arm64: update the introduction of xen boot commands in docs/grub.texi fu.wei
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 11+ messages in thread
From: fu.wei @ 2016-05-10 14:03 UTC (permalink / raw)
  To: grub-devel, arvidjaar, phcoder
  Cc: xen-devel, Ian.Campbell, jcm, julien.grall, leif.lindholm,
	linaro-uefi, Fu Wei

From: Fu Wei <fu.wei@linaro.org>

This patch adds the support of xen_boot command:
    xen_hypervisor
    xen_module

Also add a new "feature_xen_boot" to indicate this grub support
xen_boot command.

Signed-off-by: Fu Wei <fu.wei@linaro.org>
---
 grub-core/normal/main.c     |  2 +-
 util/grub.d/20_linux_xen.in | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
index 78a70a8..3402a05 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -488,7 +488,7 @@ static const char *features[] = {
   "feature_chainloader_bpb", "feature_ntldr", "feature_platform_search_hint",
   "feature_default_font_path", "feature_all_video_module",
   "feature_menuentry_id", "feature_menuentry_options", "feature_200_final",
-  "feature_nativedisk_cmd", "feature_timeout_style"
+  "feature_nativedisk_cmd", "feature_timeout_style", "feature_xen_boot"
 };
 
 GRUB_MOD_INIT(normal)
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index c48af94..6a88a39 100644
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -122,16 +122,23 @@ linux_entry ()
         else
             xen_rm_opts="no-real-mode edd=off"
         fi
-	multiboot	${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts}
+        if [ "x\$feature_xen_boot" != xy ]; then
+            xen_loader="multiboot"
+            module_loader="module"
+        else
+            xen_loader="xen_hypervisor"
+            module_loader="xen_module"
+        fi
+	\${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
-- 
2.5.5

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH v4 4/4] arm64: update the introduction of xen boot commands in docs/grub.texi
  2016-05-10 14:03 [PATCH v4 0/4] arm64,xen: add xen_boot support into grup-mkconfig fu.wei
                   ` (2 preceding siblings ...)
  2016-05-10 14:03 ` [PATCH v4 3/4] * util/grub.d/20_linux_xen.in: Add xen_boot command support fu.wei
@ 2016-05-10 14:03 ` fu.wei
  2016-05-16 11:28   ` Julien Grall
  2016-05-13 20:16 ` [PATCH v4 0/4] arm64,xen: add xen_boot support into grup-mkconfig Konrad Rzeszutek Wilk
  2016-07-05 10:48 ` [PATCH v4 0/4] arm64, xen: " Julien Grall
  5 siblings, 1 reply; 11+ messages in thread
From: fu.wei @ 2016-05-10 14:03 UTC (permalink / raw)
  To: grub-devel, arvidjaar, phcoder
  Cc: xen-devel, Ian.Campbell, jcm, julien.grall, leif.lindholm,
	linaro-uefi, Fu Wei

From: Fu Wei <fu.wei@linaro.org>

delete: xen_linux, xen_initrd, xen_xsm
add: xen_module

This update bases on
    commit 0edd750e50698854068358ea53528100a9192902
    Author: Vladimir Serbinenko <phcoder@gmail.com>
    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 <fu.wei@linaro.org>
---
 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
 
-- 
2.5.5

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH v4 0/4]  arm64,xen: add xen_boot support into grup-mkconfig
  2016-05-10 14:03 [PATCH v4 0/4] arm64,xen: add xen_boot support into grup-mkconfig fu.wei
                   ` (3 preceding siblings ...)
  2016-05-10 14:03 ` [PATCH v4 4/4] arm64: update the introduction of xen boot commands in docs/grub.texi fu.wei
@ 2016-05-13 20:16 ` Konrad Rzeszutek Wilk
  2016-07-05 10:48 ` [PATCH v4 0/4] arm64, xen: " Julien Grall
  5 siblings, 0 replies; 11+ messages in thread
From: Konrad Rzeszutek Wilk @ 2016-05-13 20:16 UTC (permalink / raw)
  To: The development of GNU GRUB
  Cc: xen-devel, Ian.Campbell, arvidjaar, phcoder, julien.grall,
	leif.lindholm, linaro-uefi, jcm, Fu Wei

On Tue, May 10, 2016 at 10:03:22PM +0800, fu.wei@linaro.org wrote:
> From: Fu Wei <fu.wei@linaro.org>
> 
> This patchset add xen_boot support into grup-mkconfig for
> generating xen boot entrances automatically
> 

All of them look good to me.

Thanks!
> Also update the docs/grub.texi for new xen_boot commands.
> 
> This patchset has been tested on Foudation model with a bug fix:
> http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00205.html
> 
> ChangeLog:
> v4: http://lists.gnu.org/archive/html/grub-devel/2016-05/
>     according to the XSM loading mechanism of Xen(upstreamed),
>     update the introduction of xen_module commands in docs/grub.texi
> 
> v3: http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00314.html
>     reorder the patches
>     update the introduction of xen_module commands in docs/grub.texi
> 
> v2: http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00282.html
>     add "--nounzip" option support in xen_module
>     use "feature_xen_boot" instead of "grub_xen_boot"
>     update the introduction of xen boot commands in docs/grub.texi
> 
> v1 :first upstream patchset:
>     http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00264.html
> 
> Fu Wei (4):
>   i386,xen: Add xen_hypervisor and xen_module aliases for i386
>   arm64: add "--nounzip" option support in xen_module command
>   * util/grub.d/20_linux_xen.in: Add xen_boot command support
>   arm64: update the introduction of xen boot commands in docs/grub.texi
> 
>  docs/grub.texi                    | 33 ++++++++++-----------------------
>  grub-core/loader/arm64/xen_boot.c | 17 +++++++++++++++++
>  grub-core/loader/i386/xen.c       |  7 +++++++
>  grub-core/normal/main.c           |  2 +-
>  util/grub.d/20_linux_xen.in       | 13 ++++++++++---
>  5 files changed, 45 insertions(+), 27 deletions(-)
> 
> -- 
> 2.5.5
> 
> 
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> https://lists.gnu.org/mailman/listinfo/grub-devel

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v4 4/4] arm64: update the introduction of xen boot commands in docs/grub.texi
  2016-05-10 14:03 ` [PATCH v4 4/4] arm64: update the introduction of xen boot commands in docs/grub.texi fu.wei
@ 2016-05-16 11:28   ` Julien Grall
  2016-05-20  2:14     ` [Xen-devel] " Fu Wei
  0 siblings, 1 reply; 11+ messages in thread
From: Julien Grall @ 2016-05-16 11:28 UTC (permalink / raw)
  To: fu.wei, grub-devel, arvidjaar, phcoder
  Cc: xen-devel, Ian.Campbell, jcm, julien.grall, leif.lindholm,
	Stefano Stabellini, linaro-uefi

Hi Fu Wei,

(CC Stefano)

On 10/05/16 15:03, fu.wei@linaro.org wrote:
> From: Fu Wei <fu.wei@linaro.org>
>
> delete: xen_linux, xen_initrd, xen_xsm
> add: xen_module
>
> This update bases on
>      commit 0edd750e50698854068358ea53528100a9192902
>      Author: Vladimir Serbinenko <phcoder@gmail.com>
>      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 <fu.wei@linaro.org>
> ---
>   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.

I find the instruction confusing. You wrote that XSM can be loaded any 
time after the 1st module, but just before you wrote that ramdisk should 
always be the first one.

What about:
"Modules should be loaded in the following order:
  - dom0 kernel image
  - dom0 ramdisk if present
  - XSM policy if present"

Regards,

-- 
Julien Grall

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Xen-devel] [PATCH v4 4/4] arm64: update the introduction of xen boot commands in docs/grub.texi
  2016-05-16 11:28   ` Julien Grall
@ 2016-05-20  2:14     ` Fu Wei
  0 siblings, 0 replies; 11+ messages in thread
From: Fu Wei @ 2016-05-20  2:14 UTC (permalink / raw)
  To: Julien Grall
  Cc: The development of GNU GRUB, xen-devel, Ian Campbell,
	Andrei Borzenkov, Jon Masters, Julien Grall, Leif Lindholm,
	Linaro UEFI Mailman List, Stefano Stabellini,
	Vladimir Serbinenko

Hi Julien,

On 16 May 2016 at 19:28, Julien Grall <julien.grall@arm.com> wrote:
> Hi Fu Wei,
>
> (CC Stefano)
>
>
> On 10/05/16 15:03, fu.wei@linaro.org wrote:
>>
>> From: Fu Wei <fu.wei@linaro.org>
>>
>> delete: xen_linux, xen_initrd, xen_xsm
>> add: xen_module
>>
>> This update bases on
>>      commit 0edd750e50698854068358ea53528100a9192902
>>      Author: Vladimir Serbinenko <phcoder@gmail.com>
>>      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 <fu.wei@linaro.org>
>> ---
>>   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.
>
>
> I find the instruction confusing. You wrote that XSM can be loaded any time
> after the 1st module, but just before you wrote that ramdisk should always
> be the first one.
>
> What about:
> "Modules should be loaded in the following order:
>  - dom0 kernel image
>  - dom0 ramdisk if present
>  - XSM policy if present"

yes, Thanks for your suggestion, it's simpler and less confused.

will do.

>
> Regards,
>
> --
> Julien Grall



-- 
Best regards,

Fu Wei
Software Engineer
Red Hat Software (Beijing) Co.,Ltd.Shanghai Branch
Ph: +86 21 61221326(direct)
Ph: +86 186 2020 4684 (mobile)
Room 1512, Regus One Corporate Avenue,Level 15,
One Corporate Avenue,222 Hubin Road,Huangpu District,
Shanghai,China 200021

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v4 0/4] arm64, xen: add xen_boot support into grup-mkconfig
  2016-05-10 14:03 [PATCH v4 0/4] arm64,xen: add xen_boot support into grup-mkconfig fu.wei
                   ` (4 preceding siblings ...)
  2016-05-13 20:16 ` [PATCH v4 0/4] arm64,xen: add xen_boot support into grup-mkconfig Konrad Rzeszutek Wilk
@ 2016-07-05 10:48 ` Julien Grall
  2016-07-06 17:58   ` [Xen-devel] " Fu Wei
  5 siblings, 1 reply; 11+ messages in thread
From: Julien Grall @ 2016-07-05 10:48 UTC (permalink / raw)
  To: fu.wei, grub-devel, arvidjaar, phcoder
  Cc: xen-devel, Steve Capper, jcm, julien.grall, leif.lindholm,
	Stefano Stabellini, linaro-uefi

Hi Fu Wei,

What is the status of this series? IIRC the comments on this version 
were minor.

Regards,

On 10/05/16 15:03, fu.wei@linaro.org wrote:
> From: Fu Wei <fu.wei@linaro.org>
>
> This patchset add xen_boot support into grup-mkconfig for
> generating xen boot entrances automatically
>
> Also update the docs/grub.texi for new xen_boot commands.
>
> This patchset has been tested on Foudation model with a bug fix:
> http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00205.html
>
> ChangeLog:
> v4: http://lists.gnu.org/archive/html/grub-devel/2016-05/
>      according to the XSM loading mechanism of Xen(upstreamed),
>      update the introduction of xen_module commands in docs/grub.texi
>
> v3: http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00314.html
>      reorder the patches
>      update the introduction of xen_module commands in docs/grub.texi
>
> v2: http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00282.html
>      add "--nounzip" option support in xen_module
>      use "feature_xen_boot" instead of "grub_xen_boot"
>      update the introduction of xen boot commands in docs/grub.texi
>
> v1 :first upstream patchset:
>      http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00264.html
>
> Fu Wei (4):
>    i386,xen: Add xen_hypervisor and xen_module aliases for i386
>    arm64: add "--nounzip" option support in xen_module command
>    * util/grub.d/20_linux_xen.in: Add xen_boot command support
>    arm64: update the introduction of xen boot commands in docs/grub.texi
>
>   docs/grub.texi                    | 33 ++++++++++-----------------------
>   grub-core/loader/arm64/xen_boot.c | 17 +++++++++++++++++
>   grub-core/loader/i386/xen.c       |  7 +++++++
>   grub-core/normal/main.c           |  2 +-
>   util/grub.d/20_linux_xen.in       | 13 ++++++++++---
>   5 files changed, 45 insertions(+), 27 deletions(-)
>

-- 
Julien Grall

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [Xen-devel] [PATCH v4 0/4] arm64, xen: add xen_boot support into grup-mkconfig
  2016-07-05 10:48 ` [PATCH v4 0/4] arm64, xen: " Julien Grall
@ 2016-07-06 17:58   ` Fu Wei
  2016-07-06 18:05     ` Julien Grall
  0 siblings, 1 reply; 11+ messages in thread
From: Fu Wei @ 2016-07-06 17:58 UTC (permalink / raw)
  To: Julien Grall
  Cc: grub-devel, xen-devel, Steve Capper, arvidjaar, Jon Masters,
	julien.grall, Leif Lindholm, linaro-uefi, Stefano Stabellini,
	Vladimir Serbinenko

Hi Julien,

On 5 July 2016 at 18:48, Julien Grall <julien.grall@arm.com> wrote:
> Hi Fu Wei,
>
> What is the status of this series? IIRC the comments on this version were
> minor.

Sorry, I missed the suggestion of docs, I have rebased them to latest
upstream grub and posted v5 just now.

Thanks for reminding me

>
> Regards,
>
>
> On 10/05/16 15:03, fu.wei@linaro.org wrote:
>>
>> From: Fu Wei <fu.wei@linaro.org>
>>
>> This patchset add xen_boot support into grup-mkconfig for
>> generating xen boot entrances automatically
>>
>> Also update the docs/grub.texi for new xen_boot commands.
>>
>> This patchset has been tested on Foudation model with a bug fix:
>> http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00205.html
>>
>> ChangeLog:
>> v4: http://lists.gnu.org/archive/html/grub-devel/2016-05/
>>      according to the XSM loading mechanism of Xen(upstreamed),
>>      update the introduction of xen_module commands in docs/grub.texi
>>
>> v3: http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00314.html
>>      reorder the patches
>>      update the introduction of xen_module commands in docs/grub.texi
>>
>> v2: http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00282.html
>>      add "--nounzip" option support in xen_module
>>      use "feature_xen_boot" instead of "grub_xen_boot"
>>      update the introduction of xen boot commands in docs/grub.texi
>>
>> v1 :first upstream patchset:
>>      http://lists.gnu.org/archive/html/grub-devel/2016-02/msg00264.html
>>
>> Fu Wei (4):
>>    i386,xen: Add xen_hypervisor and xen_module aliases for i386
>>    arm64: add "--nounzip" option support in xen_module command
>>    * util/grub.d/20_linux_xen.in: Add xen_boot command support
>>    arm64: update the introduction of xen boot commands in docs/grub.texi
>>
>>   docs/grub.texi                    | 33 ++++++++++-----------------------
>>   grub-core/loader/arm64/xen_boot.c | 17 +++++++++++++++++
>>   grub-core/loader/i386/xen.c       |  7 +++++++
>>   grub-core/normal/main.c           |  2 +-
>>   util/grub.d/20_linux_xen.in       | 13 ++++++++++---
>>   5 files changed, 45 insertions(+), 27 deletions(-)
>>
>
> --
> Julien Grall



-- 
Best regards,

Fu Wei
Software Engineer
Red Hat

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH v4 0/4] arm64, xen: add xen_boot support into grup-mkconfig
  2016-07-06 17:58   ` [Xen-devel] " Fu Wei
@ 2016-07-06 18:05     ` Julien Grall
  0 siblings, 0 replies; 11+ messages in thread
From: Julien Grall @ 2016-07-06 18:05 UTC (permalink / raw)
  To: Fu Wei
  Cc: grub-devel, xen-devel, Steve Capper, arvidjaar, Jon Masters,
	julien.grall, Leif Lindholm, linaro-uefi, Stefano Stabellini,
	Vladimir Serbinenko

Hi Fu Wei,

On 06/07/16 18:58, Fu Wei wrote:
> On 5 July 2016 at 18:48, Julien Grall <julien.grall@arm.com> wrote:
>> Hi Fu Wei,
>>
>> What is the status of this series? IIRC the comments on this version were
>> minor.
>
> Sorry, I missed the suggestion of docs, I have rebased them to latest
> upstream grub and posted v5 just now.

Thank you for the new series :). I will give a look tomorrow.

Cheers,

--
Julien Grall

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2016-07-06 18:05 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-10 14:03 [PATCH v4 0/4] arm64,xen: add xen_boot support into grup-mkconfig fu.wei
2016-05-10 14:03 ` [PATCH v4 1/4] i386, xen: Add xen_hypervisor and xen_module aliases for i386 fu.wei
2016-05-10 14:03 ` [PATCH v4 2/4] arm64: add "--nounzip" option support in xen_module command fu.wei
2016-05-10 14:03 ` [PATCH v4 3/4] * util/grub.d/20_linux_xen.in: Add xen_boot command support fu.wei
2016-05-10 14:03 ` [PATCH v4 4/4] arm64: update the introduction of xen boot commands in docs/grub.texi fu.wei
2016-05-16 11:28   ` Julien Grall
2016-05-20  2:14     ` [Xen-devel] " Fu Wei
2016-05-13 20:16 ` [PATCH v4 0/4] arm64,xen: add xen_boot support into grup-mkconfig Konrad Rzeszutek Wilk
2016-07-05 10:48 ` [PATCH v4 0/4] arm64, xen: " Julien Grall
2016-07-06 17:58   ` [Xen-devel] " Fu Wei
2016-07-06 18:05     ` Julien Grall

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