From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH for-4.10 v2 5/5] tools/dombuilder: Prevent failures of xc_dom_gnttab_init() Date: Thu, 12 Oct 2017 20:19:09 +0100 Message-ID: <1507835949-9429-6-git-send-email-andrew.cooper3@citrix.com> References: <1507835949-9429-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1507835949-9429-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Xen-devel Cc: Andrew Cooper , Julien Grall , Ian Jackson List-Id: xen-devel@lists.xenproject.org UmVjZW50IGNoYW5nZXMgaW4gZ3JhbnQgdGFibGUgY29uZmlndXJhdGlvbiBoYXZlIGNhdXNlZCBj YWxscyB0bwp4Y19kb21fZ250dGFiX2luaXQoKSB0byBmYWlsIGlmIG5vdCBwcm9jZWVkZWQgd2l0 aCBhIGNhbGwgdG8KeGNfZG9tYWluX3NldF9nbnR0YWJfbGltaXRzKCkuICBUaGlzIGlzIGJhY2t3 YXJkcyBmcm9tIHRoZSBwb2ludCBvZiB2aWV3IG9mCjNyZCBwYXJ0eSBkb21idWlsZGVyIHVzZXJz LgoKQWRkIG1heF97Z3JhbnQsbWFwdHJhY2t9X2ZyYW1lcyBwYXJhbWV0ZXJzIHRvIHN0cnVjdCB4 Y19kb21faW1hZ2UsIGFuZCByZXF1aXJlCnRoZW0gdG8gYmUgc2V0IGJ5IGNhbGxlcnMgdXNpbmcg eGNfZG9tX2dudHRhYl9pbml0KCkuICBMaWJ4bCwgd2hpY2ggdXNlcwp4Y19kb21fZ250dGFiX2lu aXQoKSBpdHNlbGYgaXMgdXBkYXRlZCBhcHByb3ByaWF0ZWx5LgoKU2lnbmVkLW9mZi1ieTogQW5k cmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KQWNrZWQtYnk6IFdlaSBMaXUg PHdlaS5saXUyQGNpdHJpeC5jb20+ClRlc3RlZC1ieTogSnVsaWVuIEdyYWxsIDxqdWxpZW4uZ3Jh bGxAYXJtLmNvbT4KLS0tCkNDOiBJYW4gSmFja3NvbiA8SWFuLkphY2tzb25AZXUuY2l0cml4LmNv bT4KQ0M6IEp1bGllbiBHcmFsbCA8anVsaWVuLmdyYWxsQGFybS5jb20+Cgp2MjoKICogU2V0IGVy cm5vIHRvIEVJTlZBTCBpZiBtYXhfe2dyYW50LG1hcHRyYWNrfV9mcmFtZXMgYXJlIG5vdCBwcm92 aWRlZAotLS0KIHRvb2xzL2xpYnhjL2luY2x1ZGUveGNfZG9tLmggfCAgNCArKysrCiB0b29scy9s aWJ4Yy94Y19kb21fYm9vdC5jICAgIHwgMTYgKysrKysrKysrKysrKysrKwogdG9vbHMvbGlieGMv eGNfZG9tX2NvcmUuYyAgICB8ICAzICsrKwogdG9vbHMvbGlieGwvbGlieGxfZG9tLmMgICAgICB8 IDEyICsrKysrKy0tLS0tLQogNCBmaWxlcyBjaGFuZ2VkLCAyOSBpbnNlcnRpb25zKCspLCA2IGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhjL2luY2x1ZGUveGNfZG9tLmggYi90 b29scy9saWJ4Yy9pbmNsdWRlL3hjX2RvbS5oCmluZGV4IGExYzNkZTIuLjUyOTI0MjQgMTAwNjQ0 Ci0tLSBhL3Rvb2xzL2xpYnhjL2luY2x1ZGUveGNfZG9tLmgKKysrIGIvdG9vbHMvbGlieGMvaW5j bHVkZS94Y19kb20uaApAQCAtMTE2LDYgKzExNiwxMCBAQCBzdHJ1Y3QgeGNfZG9tX2ltYWdlIHsK ICAgICB1aW50MzJfdCBjb25zb2xlX2RvbWlkOwogICAgIHVpbnQzMl90IHhlbnN0b3JlX2RvbWlk OwogCisgICAgLyogR3JhbnQgbGltaXQgY29uZmlndXJhdGlvbjsgbWFuZGF0b3J5IGlmIGNhbGxp bmcgeGNfZG9tX2dudHRhYl9pbml0KCkuICovCisgICAgdW5zaWduZWQgaW50IG1heF9ncmFudF9m cmFtZXM7CisgICAgdW5zaWduZWQgaW50IG1heF9tYXB0cmFja19mcmFtZXM7CisKICAgICAvKgog ICAgICAqIGluaXRyZCBwYXJhbWV0ZXJzIGFzIHNwZWNpZmllZCBpbiBzdGFydF9pbmZvIHBhZ2UK ICAgICAgKiBEZXBlbmRpbmcgb24gY2FwYWJpbGl0aWVzIG9mIHRoZSBib290ZWQga2VybmVsIHRo aXMgbWF5IGJlIGEgdmlydHVhbApkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGMveGNfZG9tX2Jvb3Qu YyBiL3Rvb2xzL2xpYnhjL3hjX2RvbV9ib290LmMKaW5kZXggNzU4MzZiZC4uN2MyMWZlYSAxMDA2 NDQKLS0tIGEvdG9vbHMvbGlieGMveGNfZG9tX2Jvb3QuYworKysgYi90b29scy9saWJ4Yy94Y19k b21fYm9vdC5jCkBAIC00MjAsNiArNDIwLDIyIEBAIGludCB4Y19kb21fZ250dGFiX2h2bV9zZWVk KHhjX2ludGVyZmFjZSAqeGNoLCB1aW50MzJfdCBkb21pZCwKIAogaW50IHhjX2RvbV9nbnR0YWJf aW5pdChzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20pCiB7CisgICAgaW50IHJjOworCisgICAgaWYg KCBkb20tPm1heF9ncmFudF9mcmFtZXMgPT0gLTEgfHwgZG9tLT5tYXhfbWFwdHJhY2tfZnJhbWVz ID09IC0xICkKKyAgICB7CisgICAgICAgIHhjX2RvbV9wYW5pYyhkb20tPnhjaCwgWENfSU5WQUxJ RF9QQVJBTSwKKyAgICAgICAgICAgICAgICAgICAgICIlczogQ2FsbGVyIGRpZG4ndCBzZXQgZ3Jh bnQgbGltaXQgaW5mb3JtYXRpb24iLCBfX2Z1bmNfXyk7CisgICAgICAgIGVycm5vID0gRUlOVkFM OworCisgICAgICAgIHJldHVybiAtMTsKKyAgICB9CisKKyAgICBpZiAoIChyYyA9IHhjX2RvbWFp bl9zZXRfZ250dGFiX2xpbWl0cyhkb20tPnhjaCwgZG9tLT5ndWVzdF9kb21pZCwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkb20tPm1heF9ncmFudF9mcmFtZXMs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZG9tLT5tYXhfbWFw dHJhY2tfZnJhbWVzKSkgIT0gMCApCisgICAgICAgIHJldHVybiByYzsKKwogICAgIGlmICggeGNf ZG9tX3RyYW5zbGF0ZWQoZG9tKSApIHsKICAgICAgICAgcmV0dXJuIHhjX2RvbV9nbnR0YWJfaHZt X3NlZWQoZG9tLT54Y2gsIGRvbS0+Z3Vlc3RfZG9taWQsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGRvbS0+Y29uc29sZV9nZm4sIGRvbS0+eGVuc3RvcmVfZ2ZuLApkaWZm IC0tZ2l0IGEvdG9vbHMvbGlieGMveGNfZG9tX2NvcmUuYyBiL3Rvb2xzL2xpYnhjL3hjX2RvbV9j b3JlLmMKaW5kZXggNzA4N2M1MC4uZDY2MDY1MSAxMDA2NDQKLS0tIGEvdG9vbHMvbGlieGMveGNf ZG9tX2NvcmUuYworKysgYi90b29scy9saWJ4Yy94Y19kb21fY29yZS5jCkBAIC03ODQsNiArNzg0 LDkgQEAgc3RydWN0IHhjX2RvbV9pbWFnZSAqeGNfZG9tX2FsbG9jYXRlKHhjX2ludGVyZmFjZSAq eGNoLAogICAgIGRvbS0+Y29uc29sZV9kb21pZCA9IElOVkFMSURfRE9NSUQ7CiAgICAgZG9tLT54 ZW5zdG9yZV9kb21pZCA9IElOVkFMSURfRE9NSUQ7CiAKKyAgICBkb20tPm1heF9ncmFudF9mcmFt ZXMgPSAtMTsKKyAgICBkb20tPm1heF9tYXB0cmFja19mcmFtZXMgPSAtMTsKKwogICAgIGRvbS0+ ZmxhZ3MgPSBTSUZfVklSVF9QMk1fNFRPT0xTOwogCiAgICAgZG9tLT5hbGxvY19tYWxsb2MgKz0g c2l6ZW9mKCpkb20pOwpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwvbGlieGxfZG9tLmMgYi90b29s cy9saWJ4bC9saWJ4bF9kb20uYwppbmRleCBmY2RlZWYwLi5mYTUzMTlkIDEwMDY0NAotLS0gYS90 b29scy9saWJ4bC9saWJ4bF9kb20uYworKysgYi90b29scy9saWJ4bC9saWJ4bF9kb20uYwpAQCAt MzU4LDEyICszNTgsNiBAQCBpbnQgbGlieGxfX2J1aWxkX3ByZShsaWJ4bF9fZ2MgKmdjLCB1aW50 MzJfdCBkb21pZCwKICAgICAgICAgcmV0dXJuIEVSUk9SX0ZBSUw7CiAgICAgfQogCi0gICAgaWYg KHhjX2RvbWFpbl9zZXRfZ250dGFiX2xpbWl0cyhjdHgtPnhjaCwgZG9taWQsIGluZm8tPm1heF9n cmFudF9mcmFtZXMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbmZvLT5t YXhfbWFwdHJhY2tfZnJhbWVzKSAhPSAwKSB7Ci0gICAgICAgIExPRyhFUlJPUiwgIkNvdWxkbid0 IHNldCBncmFudCB0YWJsZSBsaW1pdHMiKTsKLSAgICAgICAgcmV0dXJuIEVSUk9SX0ZBSUw7Ci0g ICAgfQotCiAgICAgLyoKICAgICAgKiBDaGVjayBpZiB0aGUgZG9tYWluIGhhcyBhbnkgQ1BVIG9y IG5vZGUgYWZmaW5pdHkgYWxyZWFkeS4gSWYgbm90LCB0cnkKICAgICAgKiB0byBidWlsZCB1cCB0 aGUgbGF0dGVyIHZpYSBhdXRvbWF0aWMgTlVNQSBwbGFjZW1lbnQuIEluIGZhY3QsIGluIGNhc2UK QEAgLTgxNSw2ICs4MDksOSBAQCBpbnQgbGlieGxfX2J1aWxkX3B2KGxpYnhsX19nYyAqZ2MsIHVp bnQzMl90IGRvbWlkLAogICAgIGRvbS0+eGVuc3RvcmVfZG9taWQgPSBzdGF0ZS0+c3RvcmVfZG9t aWQ7CiAgICAgZG9tLT5jbGFpbV9lbmFibGVkID0gbGlieGxfZGVmYm9vbF92YWwoaW5mby0+Y2xh aW1fbW9kZSk7CiAKKyAgICBkb20tPm1heF9ncmFudF9mcmFtZXMgICAgPSBpbmZvLT5tYXhfZ3Jh bnRfZnJhbWVzOworICAgIGRvbS0+bWF4X21hcHRyYWNrX2ZyYW1lcyA9IGluZm8tPm1heF9tYXB0 cmFja19mcmFtZXM7CisKICAgICBpZiAoaW5mby0+bnVtX3ZudW1hX25vZGVzICE9IDApIHsKICAg ICAgICAgdW5zaWduZWQgaW50IGk7CiAKQEAgLTExNTEsNiArMTE0OCw5IEBAIGludCBsaWJ4bF9f YnVpbGRfaHZtKGxpYnhsX19nYyAqZ2MsIHVpbnQzMl90IGRvbWlkLAogICAgIGRvbS0+eGVuc3Rv cmVfZXZ0Y2huID0gc3RhdGUtPnN0b3JlX3BvcnQ7CiAgICAgZG9tLT54ZW5zdG9yZV9kb21pZCA9 IHN0YXRlLT5zdG9yZV9kb21pZDsKIAorICAgIGRvbS0+bWF4X2dyYW50X2ZyYW1lcyAgICA9IGlu Zm8tPm1heF9ncmFudF9mcmFtZXM7CisgICAgZG9tLT5tYXhfbWFwdHJhY2tfZnJhbWVzID0gaW5m by0+bWF4X21hcHRyYWNrX2ZyYW1lczsKKwogICAgIC8qIFRoZSBwYXJhbXMgZnJvbSB0aGUgY29u ZmlndXJhdGlvbiBmaWxlIGFyZSBpbiBNYiwgd2hpY2ggYXJlIHRoZW4KICAgICAgKiBtdWx0aXBs aWVkIGJ5IDEgS2IuIFRoaXMgd2FzIHRoZW4gZGl2aWRlZCBvZmYgd2hlbiBjYWxsaW5nCiAgICAg ICogdGhlIG9sZCB4Y19odm1fYnVpbGRfdGFyZ2V0X21lbSgpIHdoaWNoIHRoZW4gdHVybmVkIHRo ZW0gdG8gYnl0ZXMuCi0tIAoyLjEuNAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhl bi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=