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 2/3] * util/grub.d/20_linux_xen.in: Add support of the xen_boot command
Date: Thu, 25 Feb 2016 02:01:40 +0800 [thread overview]
Message-ID: <1456336901-25708-3-git-send-email-fu.wei@linaro.org> (raw)
In-Reply-To: <1456336901-25708-1-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
Signed-off-by: Fu Wei <fu.wei@linaro.org>
---
util/grub.d/20_linux_xen.in | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index 46045db..f2a7e95 100644
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -122,16 +122,28 @@ 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 [ -f \$prefix/\$grub_cpu-\$grub_platform/xen_boot.mod ]; then
+ insmod xen_boot
+ fi
+ if [ "x\$grub_xen_boot" != xy ]; then
+ xen_loader="multiboot"
+ linux_loader="module"
+ initrd_loader="module --nounzip"
+ else
+ xen_loader="xen_hypervisor"
+ linux_loader="xen_module"
+ initrd_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}
+ \${linux_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}
+ \${initrd_loader} ${rel_dirname}/${initrd}
EOF
fi
sed "s/^/$submenu_indentation/" << EOF
--
2.5.0
next prev parent reply other threads:[~2016-02-24 18:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-24 18:01 [PATCH 0/3] arm64,xen: add xen_boot support into grup-mkconfig fu.wei
2016-02-24 18:01 ` [PATCH 1/3] arm64: add grub_xen_boot env to indicate that we have xen_* commands fu.wei
2016-02-24 18:12 ` Andrei Borzenkov
2016-02-25 6:55 ` Fu Wei
2016-02-24 18:01 ` fu.wei [this message]
2016-02-24 18:09 ` [PATCH 2/3] * util/grub.d/20_linux_xen.in: Add support of the xen_boot command Andrei Borzenkov
2016-02-24 18:01 ` [PATCH 3/3] i386, xen: Add xen_hypervisor and xen_module aliases for i386 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=1456336901-25708-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 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).