From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1aYdsk-0005Hf-Ha for mharc-grub-devel@gnu.org; Wed, 24 Feb 2016 13:09:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48620) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYdsi-0005HE-AU for grub-devel@gnu.org; Wed, 24 Feb 2016 13:09:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYdsd-0004xt-BN for grub-devel@gnu.org; Wed, 24 Feb 2016 13:09:48 -0500 Received: from mail-lf0-x22d.google.com ([2a00:1450:4010:c07::22d]:34248) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYdsd-0004xe-2q for grub-devel@gnu.org; Wed, 24 Feb 2016 13:09:43 -0500 Received: by mail-lf0-x22d.google.com with SMTP id j78so17322980lfb.1 for ; Wed, 24 Feb 2016 10:09:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=qp/us7ztqIAznNYlyy9e0lLZ90ZbidWy+DxtivitBH0=; b=KknEqLWI/K1tjiCfKnV8pCgCDnYxRBcpwD/ZgW8L/5zpKHxOYYJqVmzO3Wx0YgHyCh cdiJ6BFaErHs1b33X369M0jECVUA8zOpYOQme4k2spElLRl+EaN20jyNiFiUIxodIzKn mHd1EEMb1qJhug6YKcS+ou2cZKeYpIYMa/IbzZVr2/9erv/hPiuXyZnNykz+WYadVALD ZqcDsY+Eu/4XskbEDSBEdvGspg6rhFQcZD6P7LokPzewXix+qRASKIbpkPPcAyvfXCP+ bMtqJpX6VuKrbRZkik2grSBJvninnYXIs71jVfE9T7I7BHcBs7flV/aHUAyxodys2GXR wbeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding; bh=qp/us7ztqIAznNYlyy9e0lLZ90ZbidWy+DxtivitBH0=; b=ZzPHnXjrir3JcJtcd4Em/jHQ9s6hwXgbyjOakH249kv+n+l5m46Kaquajp0nvgzozP B4/LRyf1FQHANAJcbNaoLSBVQHRgM3Z9vuTA3BdHlWWkGhUz2BzwmWIlLHzN6zjIbiNx xtxTWJbkmCEiuhB0QxmPhw3757RGVmZkoTa3p26ZDOqUP5072xDknoGMHKJ4xLGv8Xg6 xBEr4nRPnYtJLPR2G8+5/Ws9d60GbRmMEt4jXAL6cLTNW4ih8zrMgXPMdxwG13/QrGuW p5/kch2jbmP253EpmZpbIPiVLt86kHWjqLZGWWZSBp8TYvH+KUbwtXv+ItcgB+ZawazA PAGA== X-Gm-Message-State: AG10YOSGJ9gEzEeoBskYZlCx6jQcmCpZLD3XdX4l/wWBfHTSzjDldOmndjBb7BFBRXzcNw== X-Received: by 10.25.154.14 with SMTP id c14mr15712469lfe.35.1456337382286; Wed, 24 Feb 2016 10:09:42 -0800 (PST) Received: from [192.168.1.41] (ppp109-252-76-159.pppoe.spdop.ru. [109.252.76.159]) by smtp.gmail.com with ESMTPSA id um4sm541327lbb.1.2016.02.24.10.09.40 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Feb 2016 10:09:41 -0800 (PST) Subject: Re: [PATCH 2/3] * util/grub.d/20_linux_xen.in: Add support of the xen_boot command To: fu.wei@linaro.org, grub-devel@gnu.org, phcoder@gmail.com References: <1456336901-25708-1-git-send-email-fu.wei@linaro.org> <1456336901-25708-3-git-send-email-fu.wei@linaro.org> From: Andrei Borzenkov Message-ID: <56CDF1E4.7010703@gmail.com> Date: Wed, 24 Feb 2016 21:09:40 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <1456336901-25708-3-git-send-email-fu.wei@linaro.org> Content-Type: text/plain; charset=windows-1251 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::22d 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 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: Wed, 24 Feb 2016 18:09:49 -0000 24.02.2016 21:01, fu.wei@linaro.org пишет: > From: Fu Wei > > This patch adds the support of xen_boot command: > xen_hypervisor > xen_module > > Signed-off-by: Fu Wei > --- > 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 This should be feature test, see other mail. > + 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_module will uncompress initrd (at least, as long as corresponding filters are loaded). This makes two commands incompatible. xen_module likely needs to support the same option. > + \${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 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrei Borzenkov Subject: Re: [PATCH 2/3] * util/grub.d/20_linux_xen.in: Add support of the xen_boot command Date: Wed, 24 Feb 2016 21:09:40 +0300 Message-ID: <56CDF1E4.7010703@gmail.com> References: <1456336901-25708-1-git-send-email-fu.wei@linaro.org> <1456336901-25708-3-git-send-email-fu.wei@linaro.org> Reply-To: The development of GNU GRUB Mime-Version: 1.0 Content-Type: text/plain; charset="windows-1251" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1456336901-25708-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, grub-devel@gnu.org, 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 List-Id: xen-devel@lists.xenproject.org MjQuMDIuMjAxNiAyMTowMSwgZnUud2VpQGxpbmFyby5vcmcg7+j45fI6Cj4gRnJvbTogRnUgV2Vp IDxmdS53ZWlAbGluYXJvLm9yZz4KPiAKPiBUaGlzIHBhdGNoIGFkZHMgdGhlIHN1cHBvcnQgb2Yg eGVuX2Jvb3QgY29tbWFuZDoKPiAgICAgeGVuX2h5cGVydmlzb3IKPiAgICAgeGVuX21vZHVsZQo+ IAo+IFNpZ25lZC1vZmYtYnk6IEZ1IFdlaSA8ZnUud2VpQGxpbmFyby5vcmc+Cj4gLS0tCj4gIHV0 aWwvZ3J1Yi5kLzIwX2xpbnV4X3hlbi5pbiB8IDE4ICsrKysrKysrKysrKysrKy0tLQo+ICAxIGZp bGUgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0t Z2l0IGEvdXRpbC9ncnViLmQvMjBfbGludXhfeGVuLmluIGIvdXRpbC9ncnViLmQvMjBfbGludXhf eGVuLmluCj4gaW5kZXggNDYwNDVkYi4uZjJhN2U5NSAxMDA2NDQKPiAtLS0gYS91dGlsL2dydWIu ZC8yMF9saW51eF94ZW4uaW4KPiArKysgYi91dGlsL2dydWIuZC8yMF9saW51eF94ZW4uaW4KPiBA QCAtMTIyLDE2ICsxMjIsMjggQEAgbGludXhfZW50cnkgKCkKPiAgICAgICAgICBlbHNlCj4gICAg ICAgICAgICAgIHhlbl9ybV9vcHRzPSJuby1yZWFsLW1vZGUgZWRkPW9mZiIKPiAgICAgICAgICBm aQo+IC0JbXVsdGlib290CSR7cmVsX3hlbl9kaXJuYW1lfS8ke3hlbl9iYXNlbmFtZX0gcGxhY2Vo b2xkZXIgJHt4ZW5fYXJnc30gXCR7eGVuX3JtX29wdHN9Cj4gKyAgICAgICAgaWYgWyAtZiBcJHBy ZWZpeC9cJGdydWJfY3B1LVwkZ3J1Yl9wbGF0Zm9ybS94ZW5fYm9vdC5tb2QgXTsgdGhlbgo+ICsg ICAgICAgICAgICBpbnNtb2QgeGVuX2Jvb3QKPiArICAgICAgICBmaQo+ICsgICAgICAgIGlmIFsg InhcJGdydWJfeGVuX2Jvb3QiICE9IHh5IF07IHRoZW4KClRoaXMgc2hvdWxkIGJlIGZlYXR1cmUg dGVzdCwgc2VlIG90aGVyIG1haWwuCgo+ICsgICAgICAgICAgICB4ZW5fbG9hZGVyPSJtdWx0aWJv b3QiCj4gKyAgICAgICAgICAgIGxpbnV4X2xvYWRlcj0ibW9kdWxlIgo+ICsgICAgICAgICAgICBp bml0cmRfbG9hZGVyPSJtb2R1bGUgLS1ub3VuemlwIgo+ICsgICAgICAgIGVsc2UKPiArICAgICAg ICAgICAgeGVuX2xvYWRlcj0ieGVuX2h5cGVydmlzb3IiCj4gKyAgICAgICAgICAgIGxpbnV4X2xv YWRlcj0ieGVuX21vZHVsZSIKPiArICAgICAgICAgICAgaW5pdHJkX2xvYWRlcj0ieGVuX21vZHVs ZSIKPiArICAgICAgICBmaQoKeGVuX21vZHVsZSB3aWxsIHVuY29tcHJlc3MgaW5pdHJkIChhdCBs ZWFzdCwgYXMgbG9uZyBhcyBjb3JyZXNwb25kaW5nCmZpbHRlcnMgYXJlIGxvYWRlZCkuIFRoaXMg bWFrZXMgdHdvIGNvbW1hbmRzIGluY29tcGF0aWJsZS4geGVuX21vZHVsZQpsaWtlbHkgbmVlZHMg dG8gc3VwcG9ydCB0aGUgc2FtZSBvcHRpb24uCgo+ICsJXCR7eGVuX2xvYWRlcn0JJHtyZWxfeGVu X2Rpcm5hbWV9LyR7eGVuX2Jhc2VuYW1lfSBwbGFjZWhvbGRlciAke3hlbl9hcmdzfSBcJHt4ZW5f cm1fb3B0c30KPiAgCWVjaG8JJyQoZWNobyAiJGxtZXNzYWdlIiB8IGdydWJfcXVvdGUpJwo+IC0J bW9kdWxlCSR7cmVsX2Rpcm5hbWV9LyR7YmFzZW5hbWV9IHBsYWNlaG9sZGVyIHJvb3Q9JHtsaW51 eF9yb290X2RldmljZV90aGlzdmVyc2lvbn0gcm8gJHthcmdzfQo+ICsJXCR7bGludXhfbG9hZGVy fQkke3JlbF9kaXJuYW1lfS8ke2Jhc2VuYW1lfSBwbGFjZWhvbGRlciByb290PSR7bGludXhfcm9v dF9kZXZpY2VfdGhpc3ZlcnNpb259IHJvICR7YXJnc30KPiAgRU9GCj4gICAgaWYgdGVzdCAtbiAi JHtpbml0cmR9IiA7IHRoZW4KPiAgICAgICMgVFJBTlNMQVRPUlM6IHJhbWRpc2sgaXNuJ3QgaWRl bnRpZmllci4gU2hvdWxkIGJlIHRyYW5zbGF0ZWQuCj4gICAgICBtZXNzYWdlPSIkKGdldHRleHRf cHJpbnRmICJMb2FkaW5nIGluaXRpYWwgcmFtZGlzayAuLi4iKSIKPiAgICAgIHNlZCAicy9eLyRz dWJtZW51X2luZGVudGF0aW9uLyIgPDwgRU9GCj4gIAllY2hvCSckKGVjaG8gIiRtZXNzYWdlIiB8 IGdydWJfcXVvdGUpJwo+IC0JbW9kdWxlCS0tbm91bnppcCAgICR7cmVsX2Rpcm5hbWV9LyR7aW5p dHJkfQo+ICsJXCR7aW5pdHJkX2xvYWRlcn0JJHtyZWxfZGlybmFtZX0vJHtpbml0cmR9Cj4gIEVP Rgo+ICAgIGZpCj4gICAgc2VkICJzL14vJHN1Ym1lbnVfaW5kZW50YXRpb24vIiA8PCBFT0YKPiAK CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpHcnViLWRl dmVsIG1haWxpbmcgbGlzdApHcnViLWRldmVsQGdudS5vcmcKaHR0cHM6Ly9saXN0cy5nbnUub3Jn L21haWxtYW4vbGlzdGluZm8vZ3J1Yi1kZXZlbAo=