From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrei Borzenkov Subject: Re: [PATCH v2 2/3] util/grub.d/20_linux_xen.in: Add arm64 support Date: Tue, 14 Jul 2015 06:53:17 +0300 Message-ID: <20150714065317.36dc83aa@opensuse.site> References: <=fu.wei@linaro.org> <1436777640-31871-1-git-send-email-fu.wei@linaro.org> <1436777640-31871-3-git-send-email-fu.wei@linaro.org> Reply-To: The development of GNU GRUB Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1436777640-31871-3-git-send-email-fu.wei@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: grub-devel-bounces+gcbgd-grub-devel=m.gmane.org@gnu.org Sender: grub-devel-bounces+gcbgd-grub-devel=m.gmane.org@gnu.org To: fu.wei@linaro.org Cc: grub-devel@gnu.org, xen-devel@lists.xensource.com, Ian.Campbell@citrix.com, stefano.stabellini@eu.citrix.com, phcoder@gmail.com, leif.lindholm@linaro.org, ryan.harkin@linaro.org, linaro-uefi@lists.linaro.org, jcm@redhat.com List-Id: xen-devel@lists.xenproject.org 0JIgTW9uLCAxMyBKdWwgMjAxNSAxNjo1Mzo1OSArMDgwMApmdS53ZWlAbGluYXJvLm9yZyDQv9C4 0YjQtdGCOgoKPiBGcm9tOiBGdSBXZWkgPGZ1LndlaUBsaW5hcm8ub3JnPgo+IAo+IFRoaXMgcGF0 Y2ggYWRkcyB0aGUgc3VwcG9ydCBvZiBib290IGNvbW1hbmQgb24gYXJtNjQgZm9yIFhFTjoKPiAg ICAgeGVuX2h5cGVydmlzb3IKPiAgICAgeGVuX21vZHVsZQo+IAo+IFNpZ25lZC1vZmYtYnk6IEZ1 IFdlaSA8ZnUud2VpQGxpbmFyby5vcmc+Cj4gLS0tCj4gIHV0aWwvZ3J1Yi5kLzIwX2xpbnV4X3hl bi5pbiB8IDE0ICsrKysrKysrKysrLS0tCj4gIDEgZmlsZSBjaGFuZ2VkLCAxMSBpbnNlcnRpb25z KCspLCAzIGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS91dGlsL2dydWIuZC8yMF9saW51 eF94ZW4uaW4gYi91dGlsL2dydWIuZC8yMF9saW51eF94ZW4uaW4KPiBpbmRleCBmNTMyZmI5Li5i NTJjNTBkIDEwMDY0NAo+IC0tLSBhL3V0aWwvZ3J1Yi5kLzIwX2xpbnV4X3hlbi5pbgo+ICsrKyBi L3V0aWwvZ3J1Yi5kLzIwX2xpbnV4X3hlbi5pbgo+IEBAIC0xMjAsMTYgKzEyMCwxNiBAQCBsaW51 eF9lbnRyeSAoKQo+ICAgICAgICAgIGVsc2UKPiAgICAgICAgICAgICAgeGVuX3JtX29wdHM9Im5v LXJlYWwtbW9kZSBlZGQ9b2ZmIgo+ICAgICAgICAgIGZpCj4gLQltdWx0aWJvb3QJJHtyZWxfeGVu X2Rpcm5hbWV9LyR7eGVuX2Jhc2VuYW1lfSBwbGFjZWhvbGRlciAke3hlbl9hcmdzfSBcJHt4ZW5f cm1fb3B0c30KPiArCSR7bXVsdGlib290X2NtZH0JJHtyZWxfeGVuX2Rpcm5hbWV9LyR7eGVuX2Jh c2VuYW1lfSBwbGFjZWhvbGRlciAke3hlbl9hcmdzfSBcJHt4ZW5fcm1fb3B0c30KPiAgCWVjaG8J JyQoZWNobyAiJGxtZXNzYWdlIiB8IGdydWJfcXVvdGUpJwo+IC0JbW9kdWxlCSR7cmVsX2Rpcm5h bWV9LyR7YmFzZW5hbWV9IHBsYWNlaG9sZGVyIHJvb3Q9JHtsaW51eF9yb290X2RldmljZV90aGlz dmVyc2lvbn0gcm8gJHthcmdzfQo+ICsJJHttb2R1bGVfY21kfQkke3JlbF9kaXJuYW1lfS8ke2Jh c2VuYW1lfSBwbGFjZWhvbGRlciByb290PSR7bGludXhfcm9vdF9kZXZpY2VfdGhpc3ZlcnNpb259 IHJvICR7YXJnc30KPiAgRU9GCj4gICAgaWYgdGVzdCAtbiAiJHtpbml0cmR9IiA7IHRoZW4KPiAg ICAgICMgVFJBTlNMQVRPUlM6IHJhbWRpc2sgaXNuJ3QgaWRlbnRpZmllci4gU2hvdWxkIGJlIHRy YW5zbGF0ZWQuCj4gICAgICBtZXNzYWdlPSIkKGdldHRleHRfcHJpbnRmICJMb2FkaW5nIGluaXRp YWwgcmFtZGlzayAuLi4iKSIKPiAgICAgIHNlZCAicy9eLyRzdWJtZW51X2luZGVudGF0aW9uLyIg PDwgRU9GCj4gIAllY2hvCSckKGVjaG8gIiRtZXNzYWdlIiB8IGdydWJfcXVvdGUpJwo+IC0JbW9k dWxlCS0tbm91bnppcCAgICR7cmVsX2Rpcm5hbWV9LyR7aW5pdHJkfQo+ICsJJHttb2R1bGVfY21k fQktLW5vdW56aXAgICAke3JlbF9kaXJuYW1lfS8ke2luaXRyZH0KPiAgRU9GCj4gICAgZmkKPiAg ICBzZWQgInMvXi8kc3VibWVudV9pbmRlbnRhdGlvbi8iIDw8IEVPRgo+IEBAIC0xODUsNiArMTg1 LDE0IEBAIGNhc2UgIiRtYWNoaW5lIiBpbgo+ICAgICAgKikgR0VOS0VSTkVMX0FSQ0g9IiRtYWNo aW5lIiA7Owo+ICBlc2FjCj4gIAo+ICtpZiBbICJ4JG1hY2hpbmUiICE9IHhhYXJjaDY0IF07IHRo ZW4KPiArCW11bHRpYm9vdF9jbWQ9Im11bHRpYm9vdCIKPiArCW1vZHVsZV9jbWQ9Im1vZHVsZSIK PiArZWxzZQo+ICsJbXVsdGlib290X2NtZD0ieGVuX2h5cGVydmlzb3IiCj4gKwltb2R1bGVfY21k PSJ4ZW5fbW9kdWxlIgo+ICtmaQo+ICsKClN0cmljdGx5IHNwZWFraW5nLCB0aGlzIGlzIGJvb3Qt dGltZSBkZWNpc2lvbi4gQXMgbWVudGlvbmVkIGJ5ClZsYWRpbWlyLCBiZXR0ZXIgd291bGQgYmUg dG8gcHJvdmlkZSBhbGlhcyB4ZW5faHlwZXJ2aXNvciBhbmQKeGVuX21vZHVsZSBpbiBtdWx0aWJv b3QgZm9yIHBsYXRmb3JtcyBzdXBwb3J0aW5nIFhlbiAoaXMgTUlQUyByZWFsbHkKc3VwcG9ydGVk PykgYW5kIHVzZSBpdCBjb25zaXN0ZW50bHkuCgo+ICAjIEV4dHJhIGluZGVudGF0aW9uIHRvIGFk ZCB0byBtZW51IGVudHJpZXMgaW4gYSBzdWJtZW51LiBXZSdyZSBub3QgaW4gYSBzdWJtZW51Cj4g ICMgeWV0LCBzbyBpdCdzIGVtcHR5LiBJbiBhIHN1Ym1lbnUgaXQgd2lsbCBiZSBlcXVhbCB0byAn XHQnIChvbmUgdGFiKS4KPiAgc3VibWVudV9pbmRlbnRhdGlvbj0iIgoKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkdydWItZGV2ZWwgbWFpbGluZyBsaXN0 CkdydWItZGV2ZWxAZ251Lm9yZwpodHRwczovL2xpc3RzLmdudS5vcmcvbWFpbG1hbi9saXN0aW5m by9ncnViLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ZErHc-0001OO-0L for mharc-grub-devel@gnu.org; Mon, 13 Jul 2015 23:53:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33791) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZErHZ-0001Nr-Mv for grub-devel@gnu.org; Mon, 13 Jul 2015 23:53:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZErHV-0000PP-Lu for grub-devel@gnu.org; Mon, 13 Jul 2015 23:53:25 -0400 Received: from mail-lb0-x234.google.com ([2a00:1450:4010:c04::234]:34907) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZErHV-0000Od-CX for grub-devel@gnu.org; Mon, 13 Jul 2015 23:53:21 -0400 Received: by lblf12 with SMTP id f12so63944067lbl.2 for ; Mon, 13 Jul 2015 20:53:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=HJ60FuQ+d6F/+EaPvpxi1INLMj8LncnRhz7SS0Fq6ew=; b=Kc4lhiNT09T/NCXDYE0bGOIfYnkyfMYkrmcMu0vqeX9hYodoh99r89M3ykpSjI9W25 22LQ4/X6/9DyXURKol9f5+/JB2G6enVjedTtFSRGEPD/hU4HAwoWPJM2xpr5ehzuXeIW gIeYfn1SHxfPnjeMP87nLnAMosD/QsEX1a6+b6quVI7CAENwiv9yzXsvOJX9+jDWFWCr aXBHy9W1x2uRhtVqsKPCYQsxy1DBsgf2uTdfW49JZv9c2y/Mwgt3jwgD2YVMUhd1Y1vq QjwKx/GBV+n8HjqdzdVln8ZdsWWSdCqATcyBrMdUC5RvoKw8IXrhIz27lNMICjC8MVn+ rNMg== X-Received: by 10.112.13.166 with SMTP id i6mr7775724lbc.50.1436846000172; Mon, 13 Jul 2015 20:53:20 -0700 (PDT) Received: from opensuse.site (ppp91-76-24-71.pppoe.mtu-net.ru. [91.76.24.71]) by smtp.gmail.com with ESMTPSA id ew11sm5232939lac.31.2015.07.13.20.53.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Jul 2015 20:53:19 -0700 (PDT) Date: Tue, 14 Jul 2015 06:53:17 +0300 From: Andrei Borzenkov To: fu.wei@linaro.org Subject: Re: [PATCH v2 2/3] util/grub.d/20_linux_xen.in: Add arm64 support Message-ID: <20150714065317.36dc83aa@opensuse.site> In-Reply-To: <1436777640-31871-3-git-send-email-fu.wei@linaro.org> References: <=fu.wei@linaro.org> <1436777640-31871-1-git-send-email-fu.wei@linaro.org> <1436777640-31871-3-git-send-email-fu.wei@linaro.org> X-Mailer: Claws Mail 3.11.0 (GTK+ 2.24.28; x86_64-suse-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::234 Cc: grub-devel@gnu.org, xen-devel@lists.xensource.com, Ian.Campbell@citrix.com, stefano.stabellini@eu.citrix.com, phcoder@gmail.com, leif.lindholm@linaro.org, ryan.harkin@linaro.org, linaro-uefi@lists.linaro.org, jcm@redhat.com X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jul 2015 03:53:27 -0000 =D0=92 Mon, 13 Jul 2015 16:53:59 +0800 fu.wei@linaro.org =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > From: Fu Wei >=20 > This patch adds the support of boot command on arm64 for XEN: > xen_hypervisor > xen_module >=20 > Signed-off-by: Fu Wei > --- > util/grub.d/20_linux_xen.in | 14 +++++++++++--- > 1 file changed, 11 insertions(+), 3 deletions(-) >=20 > diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in > index f532fb9..b52c50d 100644 > --- a/util/grub.d/20_linux_xen.in > +++ b/util/grub.d/20_linux_xen.in > @@ -120,16 +120,16 @@ linux_entry () > else > xen_rm_opts=3D"no-real-mode edd=3Doff" > fi > - multiboot ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \$= {xen_rm_opts} > + ${multiboot_cmd} ${rel_xen_dirname}/${xen_basename} placeholder ${xen_a= rgs} \${xen_rm_opts} > echo '$(echo "$lmessage" | grub_quote)' > - module ${rel_dirname}/${basename} placeholder root=3D${linux_root_devic= e_thisversion} ro ${args} > + ${module_cmd} ${rel_dirname}/${basename} placeholder root=3D${linux_roo= t_device_thisversion} ro ${args} > EOF > if test -n "${initrd}" ; then > # TRANSLATORS: ramdisk isn't identifier. Should be translated. > message=3D"$(gettext_printf "Loading initial ramdisk ...")" > sed "s/^/$submenu_indentation/" << EOF > echo '$(echo "$message" | grub_quote)' > - module --nounzip ${rel_dirname}/${initrd} > + ${module_cmd} --nounzip ${rel_dirname}/${initrd} > EOF > fi > sed "s/^/$submenu_indentation/" << EOF > @@ -185,6 +185,14 @@ case "$machine" in > *) GENKERNEL_ARCH=3D"$machine" ;; > esac > =20 > +if [ "x$machine" !=3D xaarch64 ]; then > + multiboot_cmd=3D"multiboot" > + module_cmd=3D"module" > +else > + multiboot_cmd=3D"xen_hypervisor" > + module_cmd=3D"xen_module" > +fi > + Strictly speaking, this is boot-time decision. As mentioned by Vladimir, better would be to provide alias xen_hypervisor and xen_module in multiboot for platforms supporting Xen (is MIPS really supported?) and use it consistently. > # Extra indentation to add to menu entries in a submenu. We're not in a = submenu > # yet, so it's empty. In a submenu it will be equal to '\t' (one tab). > submenu_indentation=3D""