From patchwork Wed Mar 8 16:46:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Rzeszutek Wilk X-Patchwork-Id: 9611667 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9095F60414 for ; Wed, 8 Mar 2017 16:49:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F770285EA for ; Wed, 8 Mar 2017 16:49:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 83EDD28625; Wed, 8 Mar 2017 16:49:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0DC96285EA for ; Wed, 8 Mar 2017 16:49:37 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1clejq-000067-3c; Wed, 08 Mar 2017 16:46:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1clejp-000061-96 for xen-devel@lists.xenproject.org; Wed, 08 Mar 2017 16:46:57 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 91/68-23854-08530C85; Wed, 08 Mar 2017 16:46:56 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgleJIrShJLcpLzFFi42KZM10+ULfe9EC EwfT1Bhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8b6NacYCxaLVNxsmsXUwLhAsIuRi0NIoJ1J ovt0GxOE85lRov34LChnA6PEpO5WVginm1FiwvEbLF2MnEBOkUT7sU2MIDaLgIrE0vnngOIcH GwCJhJvVjmChEUEtCROPrvDBmIzC3QzS5za5Q5iCwskSLw9tJsZxOYVMJNYe20TO8T8p8wSPQ tnQCUEJU7OfAI2k1nASuLTTnMIU1pi+T8OkApOATuJv4v/gV0gKqAs8ffwPbDLJASMJfpm9bF MYBSahWTQLIRBsxAGzQK7TUvixr+XTDiFQexsieebpjMuYGRfxahRnFpUllqka2Skl1SUmZ5R kpuYmaNraGCsl5taXJyYnpqTmFSsl5yfu4kRGCv1DAyMOxinnvA7xCjJwaQkyntV9UCEEF9Sf kplRmJxRnxRaU5q8SFGGQ4OJQlebhOgnGBRanpqRVpmDjBqYdISHDxKIrzXjYHSvMUFibnFme kQqVOMuhxzZu9+wyTEkpeflyolzusOMkMApCijNA9uBCyBXGKUlRLmZWRgYBDiKUgtys0sQZV /xSjOwagkzCsLMoUnM68EbtMroCOYgI7Qdt0LckRJIkJKqoFx0fbP8se+2+e/Vbmn9mm5j66K /8Se9CXbVj5tvnz8aQzzCZmnS/9Xt/p9E/PKDSssFJSp3HLu2a39x3WVX59p3/p2f1NPWKOLW EGvcHld9p53m71m+QQnecqEHtN+fWLNhNk3NuxVyUpcqR/V6Xh1qWjKlgLHron19ep9itfOtE n4zjh/4tdbJZbijERDLeai4kQAtm5DgRsDAAA= X-Env-Sender: konrad.wilk@oracle.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1488991614!88577560!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAyODgzMzk=\n X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 37912 invoked from network); 8 Mar 2017 16:46:55 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-10.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 8 Mar 2017 16:46:55 -0000 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v28Gkfgw008195 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 8 Mar 2017 16:46:41 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.13.8/8.14.4) with ESMTP id v28GkeV2007363 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 8 Mar 2017 16:46:40 GMT Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id v28GkdPE028959; Wed, 8 Mar 2017 16:46:39 GMT Received: from char.us.oracle.com (/10.137.176.158) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 08 Mar 2017 08:46:38 -0800 Received: by char.us.oracle.com (Postfix, from userid 1000) id 737D16A09E7; Wed, 8 Mar 2017 11:46:37 -0500 (EST) Date: Wed, 8 Mar 2017 11:46:37 -0500 From: Konrad Rzeszutek Wilk To: Daniel Kiper Message-ID: <20170308164637.GC7367@char.us.oracle.com> References: <1487704799-21162-1-git-send-email-daniel.kiper@oracle.com> <1487704799-21162-5-git-send-email-daniel.kiper@oracle.com> <20170221192433.GA3484@olila.local.net-space.pl> <58ADA360020000780013CCBA@prv-mh.provo.novell.com> <20170222153421.GD3484@olila.local.net-space.pl> <20170306233904.GI29281@olila.local.net-space.pl> <20170308034414.GA25084@localhost.localdomain> <20170308141729.GC31053@olila.local.net-space.pl> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170308141729.GC31053@olila.local.net-space.pl> User-Agent: Mutt/1.7.1 (2016-10-04) X-Source-IP: aserv0021.oracle.com [141.146.126.233] Cc: Juergen Gross , sstabellini@kernel.org, ning.sun@intel.com, andrew.cooper3@citrix.com, Doug Goldstein , pgnet.dev@gmail.com, julien.grall@arm.com, Jan Beulich , xen-devel@lists.xenproject.org, qiaowei.ren@intel.com, gang.wei@intel.com, fu.wei@linaro.org Subject: Re: [Xen-devel] [PATCH v16 4/9] x86: add multiboot2 protocol support for EFI platforms X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP ..snip.. > > Now in the process I discovered that my patch for grub-mkconfig to > > detect multiboot2 payloads and use those instead of multiboot never > > made it upstream, so I had to modify my grub.cfg by hand (see below). > > It will be nice if you post it after GRUB2 2.02 release. OK, I will wait (but attaching it here). From 89a85f31602f6d5f7355ffe6e246059e63cab973 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Wed, 8 Mar 2017 11:42:43 -0500 Subject: [PATCH] Use grub-file to figure out whether multiboot2 should be used for Xen.gz The multiboot2 is much more preferable than multiboot. Especially if booting under EFI where multiboot does not have the functionality to pass ImageHandler. Signed-off-by: Konrad Rzeszutek Wilk --- util/grub.d/20_linux_xen.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in index c48af94..7aae59f 100644 --- a/util/grub.d/20_linux_xen.in +++ b/util/grub.d/20_linux_xen.in @@ -85,6 +85,10 @@ linux_entry () type="$4" args="$5" xen_args="$6" + ver="" + if $($grub_file --is-x86-multiboot2 ${xen_dirname}/${xen_basename}); then + ver="2" + fi if [ -z "$boot_device_id" ]; then boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" fi @@ -122,16 +126,16 @@ linux_entry () else xen_rm_opts="no-real-mode edd=off" fi - multiboot ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts} + multiboot${ver} ${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${ver} ${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${ver} --nounzip ${rel_dirname}/${initrd} EOF fi sed "s/^/$submenu_indentation/" << EOF