From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH for-4.10 5/5] tools/dombuilder: Prevent failures of xc_dom_gnttab_init() Date: Thu, 5 Oct 2017 19:23:44 +0100 Message-ID: <1507227824-11744-7-git-send-email-andrew.cooper3@citrix.com> References: <1507227824-11744-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: <1507227824-11744-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 , Wei Liu List-Id: xen-devel@lists.xenproject.org UmVjZW50IGNoYW5nZXMgaW4gZ3JhbnQgdGFibGUgY29uZmlndXJhdGlvbiBoYXZlIGNhdXNlZCBj YWxscyB0bwp4Y19kb21fZ250dGFiX2luaXQoKSB0byBmYWlsIGlmIG5vdCBwcm9jZWVkZWQgd2l0 aCBhIGNhbGwgdG8KeGNfZG9tYWluX3NldF9nbnR0YWJfbGltaXRzKCkuICBUaGlzIGlzIGJhY2t3 YXJkcyBmcm9tIHRoZSBwb2ludCBvZiB2aWV3IG9mCjNyZCBwYXJ0eSBkb21idWlsZGVyIHVzZXJz LgoKQWRkIG1heF97Z3JhbnQsbWFwdHJhY2t9X2ZyYW1lcyBwYXJhbWV0ZXJzIHRvIHN0cnVjdCB4 Y19kb21faW1hZ2UsIGFuZCByZXF1aXJlCnRoZW0gdG8gYmUgc2V0IGJ5IGNhbGxlcnMgdXNpbmcg eGNfZG9tX2dudHRhYl9pbml0KCkuICBMaWJ4bCwgd2hpY2ggdXNlcwp4Y19kb21fZ250dGFiX2lu aXQoKSBpdHNlbGYgaXMgdXBkYXRlZCBhcHByb3ByaWF0ZWx5LgoKU2lnbmVkLW9mZi1ieTogQW5k cmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KLS0tCkNDOiBJYW4gSmFja3Nv biA8SWFuLkphY2tzb25AZXUuY2l0cml4LmNvbT4KQ0M6IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJp eC5jb20+CkNDOiBKdWxpZW4gR3JhbGwgPGp1bGllbi5ncmFsbEBhcm0uY29tPgotLS0KIHRvb2xz L2xpYnhjL2luY2x1ZGUveGNfZG9tLmggfCAgNCArKysrCiB0b29scy9saWJ4Yy94Y19kb21fYm9v dC5jICAgIHwgMTQgKysrKysrKysrKysrKysKIHRvb2xzL2xpYnhjL3hjX2RvbV9jb3JlLmMgICAg fCAgMyArKysKIHRvb2xzL2xpYnhsL2xpYnhsX2RvbS5jICAgICAgfCAxMiArKysrKystLS0tLS0K IDQgZmlsZXMgY2hhbmdlZCwgMjcgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS90b29scy9saWJ4Yy9pbmNsdWRlL3hjX2RvbS5oIGIvdG9vbHMvbGlieGMvaW5jbHVk ZS94Y19kb20uaAppbmRleCA3OTA4NjliLi44ZTY3M2ZiIDEwMDY0NAotLS0gYS90b29scy9saWJ4 Yy9pbmNsdWRlL3hjX2RvbS5oCisrKyBiL3Rvb2xzL2xpYnhjL2luY2x1ZGUveGNfZG9tLmgKQEAg LTExNiw2ICsxMTYsMTAgQEAgc3RydWN0IHhjX2RvbV9pbWFnZSB7CiAgICAgZG9taWRfdCBjb25z b2xlX2RvbWlkOwogICAgIGRvbWlkX3QgeGVuc3RvcmVfZG9taWQ7CiAKKyAgICAvKiBHcmFudCBs aW1pdCBjb25maWd1cmF0aW9uOyBtYW5kYXRvcnkgaWYgY2FsbGluZyB4Y19kb21fZ250dGFiX2lu aXQoKS4gKi8KKyAgICB1bnNpZ25lZCBpbnQgbWF4X2dyYW50X2ZyYW1lczsKKyAgICB1bnNpZ25l ZCBpbnQgbWF4X21hcHRyYWNrX2ZyYW1lczsKKwogICAgIC8qCiAgICAgICogaW5pdHJkIHBhcmFt ZXRlcnMgYXMgc3BlY2lmaWVkIGluIHN0YXJ0X2luZm8gcGFnZQogICAgICAqIERlcGVuZGluZyBv biBjYXBhYmlsaXRpZXMgb2YgdGhlIGJvb3RlZCBrZXJuZWwgdGhpcyBtYXkgYmUgYSB2aXJ0dWFs CmRpZmYgLS1naXQgYS90b29scy9saWJ4Yy94Y19kb21fYm9vdC5jIGIvdG9vbHMvbGlieGMveGNf ZG9tX2Jvb3QuYwppbmRleCA4ZDRmZWZhLi43Y2I5ZTQwIDEwMDY0NAotLS0gYS90b29scy9saWJ4 Yy94Y19kb21fYm9vdC5jCisrKyBiL3Rvb2xzL2xpYnhjL3hjX2RvbV9ib290LmMKQEAgLTQxOSw2 ICs0MTksMjAgQEAgaW50IHhjX2RvbV9nbnR0YWJfaHZtX3NlZWQoeGNfaW50ZXJmYWNlICp4Y2gs IGRvbWlkX3QgZG9taWQsCiAKIGludCB4Y19kb21fZ250dGFiX2luaXQoc3RydWN0IHhjX2RvbV9p bWFnZSAqZG9tKQogeworICAgIGludCByYzsKKworICAgIGlmICggZG9tLT5tYXhfZ3JhbnRfZnJh bWVzID09IC0xIHx8IGRvbS0+bWF4X21hcHRyYWNrX2ZyYW1lcyA9PSAtMSApCisgICAgeworICAg ICAgICB4Y19kb21fcGFuaWMoZG9tLT54Y2gsIFhDX0lOVkFMSURfUEFSQU0sCisgICAgICAgICAg ICAgICAgICAgICAiJXM6IENhbGxlciBkaWRuJ3Qgc2V0IGdyYW50IGxpbWl0IGluZm9ybWF0aW9u IiwgX19mdW5jX18pOworICAgICAgICByZXR1cm4gLTE7CisgICAgfQorCisgICAgaWYgKCAocmMg PSB4Y19kb21haW5fc2V0X2dudHRhYl9saW1pdHMoZG9tLT54Y2gsIGRvbS0+Z3Vlc3RfZG9taWQs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZG9tLT5tYXhfZ3Jh bnRfZnJhbWVzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRv bS0+bWF4X21hcHRyYWNrX2ZyYW1lcykpICE9IDAgKQorICAgICAgICByZXR1cm4gcmM7CisKICAg ICBpZiAoIHhjX2RvbV90cmFuc2xhdGVkKGRvbSkgKSB7CiAgICAgICAgIHJldHVybiB4Y19kb21f Z250dGFiX2h2bV9zZWVkKGRvbS0+eGNoLCBkb20tPmd1ZXN0X2RvbWlkLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBkb20tPmNvbnNvbGVfZ2ZuLCBkb20tPnhlbnN0b3Jl X2dmbiwKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhjL3hjX2RvbV9jb3JlLmMgYi90b29scy9saWJ4 Yy94Y19kb21fY29yZS5jCmluZGV4IDcwODdjNTAuLmQ2NjA2NTEgMTAwNjQ0Ci0tLSBhL3Rvb2xz L2xpYnhjL3hjX2RvbV9jb3JlLmMKKysrIGIvdG9vbHMvbGlieGMveGNfZG9tX2NvcmUuYwpAQCAt Nzg0LDYgKzc4NCw5IEBAIHN0cnVjdCB4Y19kb21faW1hZ2UgKnhjX2RvbV9hbGxvY2F0ZSh4Y19p bnRlcmZhY2UgKnhjaCwKICAgICBkb20tPmNvbnNvbGVfZG9taWQgPSBJTlZBTElEX0RPTUlEOwog ICAgIGRvbS0+eGVuc3RvcmVfZG9taWQgPSBJTlZBTElEX0RPTUlEOwogCisgICAgZG9tLT5tYXhf Z3JhbnRfZnJhbWVzID0gLTE7CisgICAgZG9tLT5tYXhfbWFwdHJhY2tfZnJhbWVzID0gLTE7CisK ICAgICBkb20tPmZsYWdzID0gU0lGX1ZJUlRfUDJNXzRUT09MUzsKIAogICAgIGRvbS0+YWxsb2Nf bWFsbG9jICs9IHNpemVvZigqZG9tKTsKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhsL2xpYnhsX2Rv bS5jIGIvdG9vbHMvbGlieGwvbGlieGxfZG9tLmMKaW5kZXggZmNkZWVmMC4uZmE1MzE5ZCAxMDA2 NDQKLS0tIGEvdG9vbHMvbGlieGwvbGlieGxfZG9tLmMKKysrIGIvdG9vbHMvbGlieGwvbGlieGxf ZG9tLmMKQEAgLTM1OCwxMiArMzU4LDYgQEAgaW50IGxpYnhsX19idWlsZF9wcmUobGlieGxfX2dj ICpnYywgdWludDMyX3QgZG9taWQsCiAgICAgICAgIHJldHVybiBFUlJPUl9GQUlMOwogICAgIH0K IAotICAgIGlmICh4Y19kb21haW5fc2V0X2dudHRhYl9saW1pdHMoY3R4LT54Y2gsIGRvbWlkLCBp bmZvLT5tYXhfZ3JhbnRfZnJhbWVzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgaW5mby0+bWF4X21hcHRyYWNrX2ZyYW1lcykgIT0gMCkgewotICAgICAgICBMT0coRVJST1Is ICJDb3VsZG4ndCBzZXQgZ3JhbnQgdGFibGUgbGltaXRzIik7Ci0gICAgICAgIHJldHVybiBFUlJP Ul9GQUlMOwotICAgIH0KLQogICAgIC8qCiAgICAgICogQ2hlY2sgaWYgdGhlIGRvbWFpbiBoYXMg YW55IENQVSBvciBub2RlIGFmZmluaXR5IGFscmVhZHkuIElmIG5vdCwgdHJ5CiAgICAgICogdG8g YnVpbGQgdXAgdGhlIGxhdHRlciB2aWEgYXV0b21hdGljIE5VTUEgcGxhY2VtZW50LiBJbiBmYWN0 LCBpbiBjYXNlCkBAIC04MTUsNiArODA5LDkgQEAgaW50IGxpYnhsX19idWlsZF9wdihsaWJ4bF9f Z2MgKmdjLCB1aW50MzJfdCBkb21pZCwKICAgICBkb20tPnhlbnN0b3JlX2RvbWlkID0gc3RhdGUt PnN0b3JlX2RvbWlkOwogICAgIGRvbS0+Y2xhaW1fZW5hYmxlZCA9IGxpYnhsX2RlZmJvb2xfdmFs KGluZm8tPmNsYWltX21vZGUpOwogCisgICAgZG9tLT5tYXhfZ3JhbnRfZnJhbWVzICAgID0gaW5m by0+bWF4X2dyYW50X2ZyYW1lczsKKyAgICBkb20tPm1heF9tYXB0cmFja19mcmFtZXMgPSBpbmZv LT5tYXhfbWFwdHJhY2tfZnJhbWVzOworCiAgICAgaWYgKGluZm8tPm51bV92bnVtYV9ub2RlcyAh PSAwKSB7CiAgICAgICAgIHVuc2lnbmVkIGludCBpOwogCkBAIC0xMTUxLDYgKzExNDgsOSBAQCBp bnQgbGlieGxfX2J1aWxkX2h2bShsaWJ4bF9fZ2MgKmdjLCB1aW50MzJfdCBkb21pZCwKICAgICBk b20tPnhlbnN0b3JlX2V2dGNobiA9IHN0YXRlLT5zdG9yZV9wb3J0OwogICAgIGRvbS0+eGVuc3Rv cmVfZG9taWQgPSBzdGF0ZS0+c3RvcmVfZG9taWQ7CiAKKyAgICBkb20tPm1heF9ncmFudF9mcmFt ZXMgICAgPSBpbmZvLT5tYXhfZ3JhbnRfZnJhbWVzOworICAgIGRvbS0+bWF4X21hcHRyYWNrX2Zy YW1lcyA9IGluZm8tPm1heF9tYXB0cmFja19mcmFtZXM7CisKICAgICAvKiBUaGUgcGFyYW1zIGZy b20gdGhlIGNvbmZpZ3VyYXRpb24gZmlsZSBhcmUgaW4gTWIsIHdoaWNoIGFyZSB0aGVuCiAgICAg ICogbXVsdGlwbGllZCBieSAxIEtiLiBUaGlzIHdhcyB0aGVuIGRpdmlkZWQgb2ZmIHdoZW4gY2Fs bGluZwogICAgICAqIHRoZSBvbGQgeGNfaHZtX2J1aWxkX3RhcmdldF9tZW0oKSB3aGljaCB0aGVu IHR1cm5lZCB0aGVtIHRvIGJ5dGVzLgotLSAKMi4xLjQKCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZl bEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK