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 v2 2/4] * util/grub.d/20_linux_xen.in: Add xen_boot command support
Date: Thu, 25 Feb 2016 14:39:13 +0800 [thread overview]
Message-ID: <1456382355-24614-3-git-send-email-fu.wei@linaro.org> (raw)
In-Reply-To: <1456382355-24614-2-git-send-email-fu.wei@linaro.org>
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 46045db..998ac21 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.0
next prev parent reply other threads:[~2016-02-25 6:39 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-25 6:39 [PATCH v2 1/4] arm64: add "--nounzip" option support in xen_module command fu.wei
2016-02-25 6:39 ` fu.wei [this message]
2016-02-25 6:39 ` [PATCH v2 3/4] i386, xen: Add xen_hypervisor and xen_module aliases for i386 fu.wei
2016-02-25 6:39 ` [PATCH v2 4/4] arm64: update the introduction of xen boot commands in docs/grub.texi fu.wei
2016-02-25 17:34 ` Andrei Borzenkov
2016-02-25 17:34 ` Andrei Borzenkov
2016-02-26 4:48 ` Fu Wei
2016-02-26 4:48 ` Fu Wei
2016-02-26 4:55 ` Fu Wei
2016-02-26 4:55 ` Fu Wei
2016-02-26 5:24 ` Andrei Borzenkov
2016-02-26 5:24 ` Andrei Borzenkov
2016-02-26 5:59 ` Fu Wei
2016-02-26 5:59 ` Fu Wei
2016-02-26 10:50 ` Andrei Borzenkov
2016-02-26 11:15 ` Fu Wei
2016-02-26 14:03 ` Vladimir 'φ-coder/phcoder' Serbinenko
2016-02-26 14:03 ` Vladimir 'φ-coder/phcoder' Serbinenko
2016-02-27 2:43 ` Fu Wei
2016-02-27 2:43 ` Fu Wei
2016-02-27 20:33 ` Konrad Rzeszutek Wilk
2016-02-28 5:10 ` Andrei Borzenkov
2016-02-28 5:10 ` Andrei Borzenkov
2016-02-29 14:41 ` Konrad Rzeszutek Wilk
2016-03-01 4:02 ` Andrei Borzenkov
2016-03-01 4:02 ` Andrei Borzenkov
2016-02-25 22:26 ` Doug Goldstein
2016-02-25 22:26 ` [Xen-devel] " Doug Goldstein
2016-02-26 4:49 ` 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=1456382355-24614-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.