From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Kiper Subject: [GRUB2 PATCH v5 3/4 - FOR REVIEW ONLY] multiboot2: Do not pass memory maps to image if EFI boot services are enabled Date: Fri, 18 Mar 2016 18:00:25 +0100 Message-ID: <1458320427-4653-4-git-send-email-daniel.kiper__24196.9443894506$1458320579$gmane$org@oracle.com> References: <1458320427-4653-1-git-send-email-daniel.kiper@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1agxmV-0005hR-Ph for xen-devel@lists.xenproject.org; Fri, 18 Mar 2016 17:01:47 +0000 In-Reply-To: <1458320427-4653-1-git-send-email-daniel.kiper@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org, grub-devel@gnu.org Cc: jgross@suse.com, eric.snowberg@oracle.com, arvidjaar@gmail.com, andrew.cooper3@citrix.com, stefano.stabellini@eu.citrix.com, cardoe@cardoe.com, pgnet.dev@gmail.com, roy.franz@linaro.org, ning.sun@intel.com, david.vrabel@citrix.com, jbeulich@suse.com, phcoder@gmail.com, qiaowei.ren@intel.com, richard.l.maliszewski@intel.com, gang.wei@intel.com, fu.wei@linaro.org, seth.goldberg@oracle.com List-Id: xen-devel@lists.xenproject.org SWYgaW1hZ2UgcmVxdWVzdGVkIEVGSSBib290IHNlcnZpY2VzIHRoZW4gc2tpcCBtdWx0aWJvb3Qy IG1lbW9yeSBtYXBzLgpNYWluIHJlYXNvbiBmb3Igbm90IHByb3ZpZGluZyBtYXBzIGlzIGJlY2F1 c2UgdGhleSB3aWxsIGxpa2VseSBiZQppbnZhbGlkLiBXZSBkbyBhIGZldyBhbGxvY2F0aW9ucyBh ZnRlciBmaWxsaW5nIHRoZW0sIGUuZy4gZm9yIHJlbG9jYXRvcgpuZWVkcy4gVXN1YWxseSB3ZSBk byBub3QgY2FyZSBhcyB3ZSB3b3VsZCBoYXZlIGZpbmlzaGVkIGJvb3Qgc2VydmljZXMuCklmIHdl IGtlZXAgYm9vdCBzZXJ2aWNlcyB0aGVuIGl0IGlzIGVhc2llci9zYWZlciB0byBub3QgcHJvdmlk ZSBtYXBzLgpIb3dldmVyLCBpZiBpbWFnZSBuZWVkcyBtZW1vcnkgbWFwcyBhbmQgdGhleSBhcmUg bm90IHByb3ZpZGVkIGJ5IGJvb3Rsb2FkZXIKdGhlbiBpdCBzaG91bGQgZ2V0IGl0c2VsZiBqdXN0 IGJlZm9yZSBFeGl0Qm9vdFNlcnZpY2VzKCkgY2FsbC4KClNpZ25lZC1vZmYtYnk6IERhbmllbCBL aXBlciA8ZGFuaWVsLmtpcGVyQG9yYWNsZS5jb20+ClJldmlld2VkLWJ5OiBLb25yYWQgUnplc3p1 dGVrIFdpbGsgPGtvbnJhZC53aWxrQG9yYWNsZS5jb20+Ci0tLQp2NSAtIHN1Z2dlc3Rpb25zL2Zp eGVzOgogICAtIGltcHJvdmUgY29tbWl0IG1lc3NhZ2UKICAgICAoc3VnZ2VzdGVkIGJ5IEtvbnJh ZCBSemVzenV0ZWsgV2lsaykuCgp2MyAtIHN1Z2dlc3Rpb25zL2ZpeGVzOgogICAtIGltcHJvdmUg Y29tbWl0IG1lc3NhZ2UKICAgICAoc3VnZ2VzdGVkIGJ5IEtvbnJhZCBSemVzenV0ZWsgV2lsayBh bmQgVmxhZGltaXIgJ3BoY29kZXInIFNlcmJpbmVua28pLgotLS0KIGdydWItY29yZS9sb2FkZXIv bXVsdGlib290X21iaTIuYyB8ICAgMTcgKysrKysrKystLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCA4IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ3J1Yi1jb3Jl L2xvYWRlci9tdWx0aWJvb3RfbWJpMi5jIGIvZ3J1Yi1jb3JlL2xvYWRlci9tdWx0aWJvb3RfbWJp Mi5jCmluZGV4IDZjMDQ0MDIuLmFkMTU1M2IgMTAwNjQ0Ci0tLSBhL2dydWItY29yZS9sb2FkZXIv bXVsdGlib290X21iaTIuYworKysgYi9ncnViLWNvcmUvbG9hZGVyL211bHRpYm9vdF9tYmkyLmMK QEAgLTM5MCw3ICszOTAsNyBAQCBzdGF0aWMgZ3J1Yl9zaXplX3QKIGdydWJfbXVsdGlib290X2dl dF9tYmlfc2l6ZSAodm9pZCkKIHsKICNpZmRlZiBHUlVCX01BQ0hJTkVfRUZJCi0gIGlmICghZWZp X21tYXBfc2l6ZSkKKyAgaWYgKCFrZWVwX2JzICYmICFlZmlfbW1hcF9zaXplKQogICAgIGZpbmRf ZWZpX21tYXBfc2l6ZSAoKTsgICAgCiAjZW5kaWYKICAgcmV0dXJuIDIgKiBzaXplb2YgKGdydWJf dWludDMyX3QpICsgc2l6ZW9mIChzdHJ1Y3QgbXVsdGlib290X3RhZykKQEAgLTc1NSw2ICs3NTUs NyBAQCBncnViX211bHRpYm9vdF9tYWtlX21iaSAoZ3J1Yl91aW50MzJfdCAqdGFyZ2V0KQogICAg ICAgfQogICB9CiAKKyAgaWYgKCFrZWVwX2JzKQogICAgIHsKICAgICAgIHN0cnVjdCBtdWx0aWJv b3RfdGFnX21tYXAgKnRhZyA9IChzdHJ1Y3QgbXVsdGlib290X3RhZ19tbWFwICopIHB0cm9yaWc7 CiAgICAgICBncnViX2ZpbGxfbXVsdGlib290X21tYXAgKHRhZyk7CkBAIC03NzYsNiArNzc3LDcg QEAgZ3J1Yl9tdWx0aWJvb3RfbWFrZV9tYmkgKGdydWJfdWludDMyX3QgKnRhcmdldCkKICAgICAg IC8gc2l6ZW9mIChncnViX3Byb3Blcmx5X2FsaWduZWRfdCk7CiAgIH0KIAorICBpZiAoIWtlZXBf YnMpCiAgICAgewogICAgICAgc3RydWN0IG11bHRpYm9vdF90YWdfYmFzaWNfbWVtaW5mbyAqdGFn CiAJPSAoc3RydWN0IG11bHRpYm9vdF90YWdfYmFzaWNfbWVtaW5mbyAqKSBwdHJvcmlnOwpAQCAt ODg2LDIxICs4ODgsMTcgQEAgZ3J1Yl9tdWx0aWJvb3RfbWFrZV9tYmkgKGdydWJfdWludDMyX3Qg KnRhcmdldCkKICAgICBncnViX2VmaV91aW50bl90IGVmaV9kZXNjX3NpemU7CiAgICAgZ3J1Yl9l ZmlfdWludDMyX3QgZWZpX2Rlc2NfdmVyc2lvbjsKIAorICAgIGlmICgha2VlcF9icykKKyAgICAg IHsKIAl0YWctPnR5cGUgPSBNVUxUSUJPT1RfVEFHX1RZUEVfRUZJX01NQVA7CiAJdGFnLT5zaXpl ID0gc2l6ZW9mICgqdGFnKSArIGVmaV9tbWFwX3NpemU7CiAKLSAgICBpZiAoIWtlZXBfYnMpCiAJ ZXJyID0gZ3J1Yl9lZmlfZmluaXNoX2Jvb3Rfc2VydmljZXMgKCZlZmlfbW1hcF9zaXplLCB0YWct PmVmaV9tbWFwLCBOVUxMLAogCQkJCQkgICAgICZlZmlfZGVzY19zaXplLCAmZWZpX2Rlc2NfdmVy c2lvbik7Ci0gICAgZWxzZQotICAgICAgewotCWlmIChncnViX2VmaV9nZXRfbWVtb3J5X21hcCAo JmVmaV9tbWFwX3NpemUsICh2b2lkICopIHRhZy0+ZWZpX21tYXAsCi0JCQkJICAgICBOVUxMLAot CQkJCSAgICAgJmVmaV9kZXNjX3NpemUsICZlZmlfZGVzY192ZXJzaW9uKSA8PSAwKQotCSAgZXJy ID0gZ3J1Yl9lcnJvciAoR1JVQl9FUlJfSU8sICJjb3VsZG4ndCByZXRyaWV2ZSBtZW1vcnkgbWFw Iik7Ci0gICAgICB9CisKIAlpZiAoZXJyKQogCSAgcmV0dXJuIGVycjsKKwogCXRhZy0+ZGVzY3Jf c2l6ZSA9IGVmaV9kZXNjX3NpemU7CiAJdGFnLT5kZXNjcl92ZXJzID0gZWZpX2Rlc2NfdmVyc2lv bjsKIAl0YWctPnNpemUgPSBzaXplb2YgKCp0YWcpICsgZWZpX21tYXBfc2l6ZTsKQEAgLTkwOCw2 ICs5MDYsNyBAQCBncnViX211bHRpYm9vdF9tYWtlX21iaSAoZ3J1Yl91aW50MzJfdCAqdGFyZ2V0 KQogCXB0cm9yaWcgKz0gQUxJR05fVVAgKHRhZy0+c2l6ZSwgTVVMVElCT09UX1RBR19BTElHTikK IAkgIC8gc2l6ZW9mIChncnViX3Byb3Blcmx5X2FsaWduZWRfdCk7CiAgICAgICB9CisgIH0KIAog ICBpZiAoa2VlcF9icykKICAgICB7Ci0tIAoxLjcuMTAuNAoKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRl dmVsQGxpc3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==