From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1bMup5-0001Q4-Rx for mharc-grub-devel@gnu.org; Tue, 12 Jul 2016 06:21:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37869) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMup3-0001NW-RR for grub-devel@gnu.org; Tue, 12 Jul 2016 06:21:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMup0-00010I-Lo for grub-devel@gnu.org; Tue, 12 Jul 2016 06:21:49 -0400 Received: from foss.arm.com ([217.140.101.70]:56952) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMup0-00010E-FO for grub-devel@gnu.org; Tue, 12 Jul 2016 06:21:46 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 585F928; Tue, 12 Jul 2016 03:22:49 -0700 (PDT) Received: from [10.1.215.28] (e108454-lin.cambridge.arm.com [10.1.215.28]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 173B73F387; Tue, 12 Jul 2016 03:21:43 -0700 (PDT) Subject: Re: [PATCH v5 3/4] * util/grub.d/20_linux_xen.in: Add xen_boot command support To: fu.wei@linaro.org, grub-devel@gnu.org, arvidjaar@gmail.com, phcoder@gmail.com References: <1467827637-14508-1-git-send-email-fu.wei@linaro.org> <1467827637-14508-4-git-send-email-fu.wei@linaro.org> Cc: linaro-uefi@lists.linaro.org, xen-devel@lists.xensource.com, jcm@redhat.com, leif.lindholm@linaro.org, sstabellini@kernel.org From: Julien Grall Message-ID: <5784C4B6.6070601@arm.com> Date: Tue, 12 Jul 2016 11:21:42 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: <1467827637-14508-4-git-send-email-fu.wei@linaro.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.140.101.70 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jul 2016 10:21:51 -0000 Hi Fu Wei, On 06/07/16 18:53, fu.wei@linaro.org wrote: > From: Fu Wei > > 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 > --- > 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} What is the coding style for grub? This line is using hard tabs, but the previous one are using soft tab. > 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 > Regards, -- Julien Grall From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: Re: [PATCH v5 3/4] * util/grub.d/20_linux_xen.in: Add xen_boot command support Date: Tue, 12 Jul 2016 11:21:42 +0100 Message-ID: <5784C4B6.6070601@arm.com> References: <1467827637-14508-1-git-send-email-fu.wei@linaro.org> <1467827637-14508-4-git-send-email-fu.wei@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1467827637-14508-4-git-send-email-fu.wei@linaro.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: fu.wei@linaro.org, grub-devel@gnu.org, arvidjaar@gmail.com, phcoder@gmail.com Cc: jcm@redhat.com, xen-devel@lists.xensource.com, sstabellini@kernel.org, leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org List-Id: xen-devel@lists.xenproject.org SGkgRnUgV2VpLAoKT24gMDYvMDcvMTYgMTg6NTMsIGZ1LndlaUBsaW5hcm8ub3JnIHdyb3RlOgo+ IEZyb206IEZ1IFdlaSA8ZnUud2VpQGxpbmFyby5vcmc+Cj4KPiBUaGlzIHBhdGNoIGFkZHMgdGhl IHN1cHBvcnQgb2YgeGVuX2Jvb3QgY29tbWFuZDoKPiAgICAgIHhlbl9oeXBlcnZpc29yCj4gICAg ICB4ZW5fbW9kdWxlCj4KPiBBbHNvIGFkZCBhIG5ldyAiZmVhdHVyZV94ZW5fYm9vdCIgdG8gaW5k aWNhdGUgdGhpcyBncnViIHN1cHBvcnQKPiB4ZW5fYm9vdCBjb21tYW5kLgo+Cj4gU2lnbmVkLW9m Zi1ieTogRnUgV2VpIDxmdS53ZWlAbGluYXJvLm9yZz4KPiAtLS0KPiAgIGdydWItY29yZS9ub3Jt YWwvbWFpbi5jICAgICB8ICAyICstCj4gICB1dGlsL2dydWIuZC8yMF9saW51eF94ZW4uaW4gfCAx MyArKysrKysrKysrLS0tCj4gICAyIGZpbGVzIGNoYW5nZWQsIDExIGluc2VydGlvbnMoKyksIDQg ZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZ3J1Yi1jb3JlL25vcm1hbC9tYWluLmMgYi9n cnViLWNvcmUvbm9ybWFsL21haW4uYwo+IGluZGV4IDc4YTcwYTguLjM0MDJhMDUgMTAwNjQ0Cj4g LS0tIGEvZ3J1Yi1jb3JlL25vcm1hbC9tYWluLmMKPiArKysgYi9ncnViLWNvcmUvbm9ybWFsL21h aW4uYwo+IEBAIC00ODgsNyArNDg4LDcgQEAgc3RhdGljIGNvbnN0IGNoYXIgKmZlYXR1cmVzW10g PSB7Cj4gICAgICJmZWF0dXJlX2NoYWlubG9hZGVyX2JwYiIsICJmZWF0dXJlX250bGRyIiwgImZl YXR1cmVfcGxhdGZvcm1fc2VhcmNoX2hpbnQiLAo+ICAgICAiZmVhdHVyZV9kZWZhdWx0X2ZvbnRf cGF0aCIsICJmZWF0dXJlX2FsbF92aWRlb19tb2R1bGUiLAo+ICAgICAiZmVhdHVyZV9tZW51ZW50 cnlfaWQiLCAiZmVhdHVyZV9tZW51ZW50cnlfb3B0aW9ucyIsICJmZWF0dXJlXzIwMF9maW5hbCIs Cj4gLSAgImZlYXR1cmVfbmF0aXZlZGlza19jbWQiLCAiZmVhdHVyZV90aW1lb3V0X3N0eWxlIgo+ ICsgICJmZWF0dXJlX25hdGl2ZWRpc2tfY21kIiwgImZlYXR1cmVfdGltZW91dF9zdHlsZSIsICJm ZWF0dXJlX3hlbl9ib290Igo+ICAgfTsKPgo+ICAgR1JVQl9NT0RfSU5JVChub3JtYWwpCj4gZGlm ZiAtLWdpdCBhL3V0aWwvZ3J1Yi5kLzIwX2xpbnV4X3hlbi5pbiBiL3V0aWwvZ3J1Yi5kLzIwX2xp bnV4X3hlbi5pbgo+IGluZGV4IGM0OGFmOTQuLjZhODhhMzkgMTAwNjQ0Cj4gLS0tIGEvdXRpbC9n cnViLmQvMjBfbGludXhfeGVuLmluCj4gKysrIGIvdXRpbC9ncnViLmQvMjBfbGludXhfeGVuLmlu Cj4gQEAgLTEyMiwxNiArMTIyLDIzIEBAIGxpbnV4X2VudHJ5ICgpCj4gICAgICAgICAgIGVsc2UK PiAgICAgICAgICAgICAgIHhlbl9ybV9vcHRzPSJuby1yZWFsLW1vZGUgZWRkPW9mZiIKPiAgICAg ICAgICAgZmkKPiAtCW11bHRpYm9vdAkke3JlbF94ZW5fZGlybmFtZX0vJHt4ZW5fYmFzZW5hbWV9 IHBsYWNlaG9sZGVyICR7eGVuX2FyZ3N9IFwke3hlbl9ybV9vcHRzfQo+ICsgICAgICAgIGlmIFsg InhcJGZlYXR1cmVfeGVuX2Jvb3QiICE9IHh5IF07IHRoZW4KPiArICAgICAgICAgICAgeGVuX2xv YWRlcj0ibXVsdGlib290Igo+ICsgICAgICAgICAgICBtb2R1bGVfbG9hZGVyPSJtb2R1bGUiCj4g KyAgICAgICAgZWxzZQo+ICsgICAgICAgICAgICB4ZW5fbG9hZGVyPSJ4ZW5faHlwZXJ2aXNvciIK PiArICAgICAgICAgICAgbW9kdWxlX2xvYWRlcj0ieGVuX21vZHVsZSIKPiArICAgICAgICBmaQo+ ICsJXCR7eGVuX2xvYWRlcn0JJHtyZWxfeGVuX2Rpcm5hbWV9LyR7eGVuX2Jhc2VuYW1lfSBwbGFj ZWhvbGRlciAke3hlbl9hcmdzfSBcJHt4ZW5fcm1fb3B0c30KCldoYXQgaXMgdGhlIGNvZGluZyBz dHlsZSBmb3IgZ3J1Yj8gVGhpcyBsaW5lIGlzIHVzaW5nIGhhcmQgdGFicywgYnV0IHRoZSAKcHJl dmlvdXMgb25lIGFyZSB1c2luZyBzb2Z0IHRhYi4KCj4gICAJZWNobwknJChlY2hvICIkbG1lc3Nh Z2UiIHwgZ3J1Yl9xdW90ZSknCj4gLQltb2R1bGUJJHtyZWxfZGlybmFtZX0vJHtiYXNlbmFtZX0g cGxhY2Vob2xkZXIgcm9vdD0ke2xpbnV4X3Jvb3RfZGV2aWNlX3RoaXN2ZXJzaW9ufSBybyAke2Fy Z3N9Cj4gKwlcJHttb2R1bGVfbG9hZGVyfQkke3JlbF9kaXJuYW1lfS8ke2Jhc2VuYW1lfSBwbGFj ZWhvbGRlciByb290PSR7bGludXhfcm9vdF9kZXZpY2VfdGhpc3ZlcnNpb259IHJvICR7YXJnc30K PiAgIEVPRgo+ICAgICBpZiB0ZXN0IC1uICIke2luaXRyZH0iIDsgdGhlbgo+ICAgICAgICMgVFJB TlNMQVRPUlM6IHJhbWRpc2sgaXNuJ3QgaWRlbnRpZmllci4gU2hvdWxkIGJlIHRyYW5zbGF0ZWQu Cj4gICAgICAgbWVzc2FnZT0iJChnZXR0ZXh0X3ByaW50ZiAiTG9hZGluZyBpbml0aWFsIHJhbWRp c2sgLi4uIikiCj4gICAgICAgc2VkICJzL14vJHN1Ym1lbnVfaW5kZW50YXRpb24vIiA8PCBFT0YK PiAgIAllY2hvCSckKGVjaG8gIiRtZXNzYWdlIiB8IGdydWJfcXVvdGUpJwo+IC0JbW9kdWxlCS0t bm91bnppcCAgICR7cmVsX2Rpcm5hbWV9LyR7aW5pdHJkfQo+ICsJXCR7bW9kdWxlX2xvYWRlcn0g LS1ub3VuemlwCSR7cmVsX2Rpcm5hbWV9LyR7aW5pdHJkfQo+ICAgRU9GCj4gICAgIGZpCj4gICAg IHNlZCAicy9eLyRzdWJtZW51X2luZGVudGF0aW9uLyIgPDwgRU9GCj4KClJlZ2FyZHMsCgotLSAK SnVsaWVuIEdyYWxsCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBz Oi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK