From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH for-4.10 4/5] tools/dombuilder: Fix asymetry when setting up console and xenstore rings Date: Thu, 5 Oct 2017 19:23:42 +0100 Message-ID: <1507227824-11744-5-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 bGlieGwgYWx3YXlzIHVzZXMgeGNfZG9tX2dudHRhYl9pbml0KCksIHdoaWNoIGludGVybmFsbHkg Y2FsbHMKeGNfZG9tX2dudHRhYntfaHZtLH1fc2VlZCgpIHRvIHNldCB1cCB0aGUgZ3JhbnRzIHBv aW50IGF0IHRoZSBjb25zb2xlIGFuZAp4ZW5zdG9yZSByaW5ncy4gIEZvciBIVk0gZ3Vlc3RzLCBs aWJ4bCB0aGVuIGFza3MgWGVuIGZvciB0aGUgaW5mb3JtYXRpb24gc2V0CnVwIHByZXZpb3VzbHks IGFuZCBjYWxscyB4Y19kb21fZ250dGFiX2h2bV9zZWVkKCkgYSBzZWNvbmQgdGltZSwgd2hpY2gg aXMKd2FzdGVmdWwuICBBUk0gY29uc3RydWN0aW9uIGV4cGVjdHMgbGlieGwgdG8gaGF2ZSBzZXQg dXAKZG9tLT57Y29uc29sZSx4ZW5zdG9yZX1fZXZ0Y2huIGVhcmxpZXIsIHNvIG9ubHkgYWN0dWFs bHkgZnVuY3Rpb25zIGJlY2F1c2Ugb2YKdGhpcyBzZWNvbmQgY2FsbC4KClJhdGlvbmFsaXNlIGV2 ZXJ5dGhpbmcgYW5kIG1ha2UgaXQgY29uc2lzdGVudCBmb3IgYWxsIGd1ZXN0cy4KCiAxKSBVc2Vy cyBvZiB0aGUgZG9tYWluIGJ1aWxkZXIgYXJlIGV4cGVjdGVkIHRvIHByb3ZpZGUKICAgIGRvbS0+ e2NvbnNvbGUseGVuc3RvcmV9X3tldnRjaG4sZG9taWR9IHVuY29uZGl0aW9uYWxseS4gIFRoaXMg aXMgY2hlY2tlZAogICAgYnkgc2V0dGluZyBpbnZhbGlkIHZhbHVlcyBpbiB4Y19kb21fYWxsb2Nh dGUoKSwgYW5kIGNoZWNraW5nIGluCiAgICB4Y19kb21fYm9vdF9pbWFnZSgpLgoKIDIpIEZvciB4 ODYgSFZNIGFuZCBBUk0gZ3Vlc3RzLCB0aGUgZXZlbnQgY2hhbm5lbHMgYXJlIGdpdmVuIHRvIFhl biBhdCB0aGUKICAgIHNhbWUgdGltZSBhcyB0aGUgcmluZyBnZm5zLiAgQVJNIGFscmVhZHkgZGlk IHRoaXMsIGJ1dCB4ODYgaXMgdXBkYXRlZCB0bwogICAgbWF0Y2guICB4ODYgUFYgYWxyZWFkeSBw cm92aWRlcyB0aGlzIGluZm9ybWF0aW9uIGluIHRoZSBzdGFydF9pbmZvIHBhZ2UuCgogMykgTGli eGwgaXMgdXBkYXRlZCB0byBkcm9wIGFsbCByZWxldmVudCBmdW5jdGlvbmFsaXR5IGZyb20KICAg IGh2bV9idWlsZF9zZXRfcGFyYW1zKCksIGFuZCBiZWhhdmUgY29uc2lzdGVudGx5IHdpdGggUFYg Z3Vlc3RzIHdoZW4gaXQKICAgIGNvbWVzIHRvIHRoZSBoYW5kbGluZyBvZiBkb20tPntjb25zb2xl LHhlbnN0b3JlfV97ZXZ0Y2huLGRvbWlkLGdmbn0uCgpUaGlzIHJlbW92ZXMgc2V2ZXJhbCByZWR1 bmRhbnQgaHlwZXJjYWxscyAoaW5jbHVkaW5nIGEgZm9yZWlnbiBtYXBwaW5nKSBmcm9tCnRoZSB4 ODYgSFZNIGFuZCBBUk0gY29uc3RydWN0aW9uIHBhdGhzLgoKU2lnbmVkLW9mZi1ieTogQW5kcmV3 IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KLS0tCkNDOiBJYW4gSmFja3NvbiA8 SWFuLkphY2tzb25AZXUuY2l0cml4LmNvbT4KQ0M6IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5j b20+CkNDOiBKdWxpZW4gR3JhbGwgPGp1bGllbi5ncmFsbEBhcm0uY29tPgotLS0KIHRvb2xzL2xp YnhjL2luY2x1ZGUveGNfZG9tLmggICAgICB8IDEyICsrKysrKysrLS0tLQogdG9vbHMvbGlieGMv eGNfZG9tX2FybS5jICAgICAgICAgIHwgIDIgKy0KIHRvb2xzL2xpYnhjL3hjX2RvbV9ib290LmMg ICAgICAgICB8IDM2ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogdG9vbHMv bGlieGMveGNfZG9tX2NvbXBhdF9saW51eC5jIHwgIDIgKysKIHRvb2xzL2xpYnhjL3hjX2RvbV9j b3JlLmMgICAgICAgICB8ICA1ICsrKysrCiB0b29scy9saWJ4Yy94Y19kb21feDg2LmMgICAgICAg ICAgfCAgNCArKysrCiB0b29scy9saWJ4bC9saWJ4bF9kb20uYyAgICAgICAgICAgfCAyOCArKysr KysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiB0b29scy9saWJ4bC9saWJ4bF9pbnRlcm5hbC5oICAg ICAgfCAgMSAtCiA4IGZpbGVzIGNoYW5nZWQsIDY2IGluc2VydGlvbnMoKyksIDI0IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhjL2luY2x1ZGUveGNfZG9tLmggYi90b29scy9s aWJ4Yy9pbmNsdWRlL3hjX2RvbS5oCmluZGV4IDgwYjRmYmQuLjc5MDg2OWIgMTAwNjQ0Ci0tLSBh L3Rvb2xzL2xpYnhjL2luY2x1ZGUveGNfZG9tLmgKKysrIGIvdG9vbHMvbGlieGMvaW5jbHVkZS94 Y19kb20uaApAQCAtMjAsNiArMjAsOCBAQAogI2luY2x1ZGUgPHhlbmd1ZXN0Lmg+CiAKICNkZWZp bmUgSU5WQUxJRF9QRk4gKCh4ZW5fcGZuX3QpLTEpCisjZGVmaW5lIElOVkFMSURfRVZUQ0hOICh+ MHUpCisjZGVmaW5lIElOVkFMSURfRE9NSUQgICgtMSkKICNkZWZpbmUgWDg2X0hWTV9OUl9TUEVD SUFMX1BBR0VTICAgIDgKICNkZWZpbmUgWDg2X0hWTV9FTkRfU1BFQ0lBTF9SRUdJT04gIDB4ZmYw MDB1CiAKQEAgLTEwNCwxMCArMTA2LDE2IEBAIHN0cnVjdCB4Y19kb21faW1hZ2UgewogICAgICAq IERldGFpbHMgZm9yIHRoZSB0b29sc3RhY2stcHJlcGFyZWQgcmluZ3MuCiAgICAgICoKICAgICAg KiAqX2dmbiBmaWVsZHMgYXJlIGFsbG9jYXRlZCBieSB0aGUgZG9tYWluIGJ1aWxkZXIuCisgICAg ICogKl97ZXZ0Y2huLGRvbWlkfSBmaWVsZHMgbXVzdCBiZSBwcm92aWRlZCBieSB0aGUgY2FsbGVy LgogICAgICAqLwogICAgIHhlbl9wZm5fdCBjb25zb2xlX2dmbjsKICAgICB4ZW5fcGZuX3QgeGVu c3RvcmVfZ2ZuOwogCisgICAgdW5zaWduZWQgaW50IGNvbnNvbGVfZXZ0Y2huOworICAgIHVuc2ln bmVkIGludCB4ZW5zdG9yZV9ldnRjaG47CisgICAgZG9taWRfdCBjb25zb2xlX2RvbWlkOworICAg IGRvbWlkX3QgeGVuc3RvcmVfZG9taWQ7CisKICAgICAvKgogICAgICAqIGluaXRyZCBwYXJhbWV0 ZXJzIGFzIHNwZWNpZmllZCBpbiBzdGFydF9pbmZvIHBhZ2UKICAgICAgKiBEZXBlbmRpbmcgb24g Y2FwYWJpbGl0aWVzIG9mIHRoZSBib290ZWQga2VybmVsIHRoaXMgbWF5IGJlIGEgdmlydHVhbApA QCAtMTY1LDEwICsxNzMsNiBAQCBzdHJ1Y3QgeGNfZG9tX2ltYWdlIHsKIAogICAgIC8qIG1pc2Mg eGVuIGRvbWFpbiBjb25maWcgc3R1ZmYgKi8KICAgICB1bnNpZ25lZCBsb25nIGZsYWdzOwotICAg IHVuc2lnbmVkIGludCBjb25zb2xlX2V2dGNobjsKLSAgICB1bnNpZ25lZCBpbnQgeGVuc3RvcmVf ZXZ0Y2huOwotICAgIGRvbWlkX3QgY29uc29sZV9kb21pZDsKLSAgICBkb21pZF90IHhlbnN0b3Jl X2RvbWlkOwogICAgIHhlbl9wZm5fdCBzaGFyZWRfaW5mb19tZm47CiAKICAgICB4Y19pbnRlcmZh Y2UgKnhjaDsKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhjL3hjX2RvbV9hcm0uYyBiL3Rvb2xzL2xp YnhjL3hjX2RvbV9hcm0uYwppbmRleCBjN2FhNDRhLi5kNjY4ZGYxIDEwMDY0NAotLS0gYS90b29s cy9saWJ4Yy94Y19kb21fYXJtLmMKKysrIGIvdG9vbHMvbGlieGMveGNfZG9tX2FybS5jCkBAIC05 OSw3ICs5OSw3IEBAIHN0YXRpYyBpbnQgYWxsb2NfbWFnaWNfcGFnZXMoc3RydWN0IHhjX2RvbV9p bWFnZSAqZG9tKQogICAgICAgICAgICAgZG9tLT54ZW5zdG9yZV9nZm4pOwogICAgIHhjX2h2bV9w YXJhbV9zZXQoZG9tLT54Y2gsIGRvbS0+Z3Vlc3RfZG9taWQsIEhWTV9QQVJBTV9NT05JVE9SX1JJ TkdfUEZOLAogICAgICAgICAgICAgYmFzZSArIE1FTUFDQ0VTU19QRk5fT0ZGU0VUKTsKLSAgICAv KiBhbGxvY2F0ZWQgYnkgdG9vbHN0YWNrICovCisKICAgICB4Y19odm1fcGFyYW1fc2V0KGRvbS0+ eGNoLCBkb20tPmd1ZXN0X2RvbWlkLCBIVk1fUEFSQU1fQ09OU09MRV9FVlRDSE4sCiAgICAgICAg ICAgICBkb20tPmNvbnNvbGVfZXZ0Y2huKTsKICAgICB4Y19odm1fcGFyYW1fc2V0KGRvbS0+eGNo LCBkb20tPmd1ZXN0X2RvbWlkLCBIVk1fUEFSQU1fU1RPUkVfRVZUQ0hOLApkaWZmIC0tZ2l0IGEv dG9vbHMvbGlieGMveGNfZG9tX2Jvb3QuYyBiL3Rvb2xzL2xpYnhjL3hjX2RvbV9ib290LmMKaW5k ZXggYTg0YTk1ZS4uOGQ0ZmVmYSAxMDA2NDQKLS0tIGEvdG9vbHMvbGlieGMveGNfZG9tX2Jvb3Qu YworKysgYi90b29scy9saWJ4Yy94Y19kb21fYm9vdC5jCkBAIC0xNjMsNiArMTYzLDM5IEBAIHZv aWQgKnhjX2RvbV9ib290X2RvbVVfbWFwKHN0cnVjdCB4Y19kb21faW1hZ2UgKmRvbSwgeGVuX3Bm bl90IHBmbiwKICAgICByZXR1cm4gcHRyOwogfQogCitzdGF0aWMgaW50IHhjX2RvbV9jaGVja19y ZXF1aXJlZF9maWVsZHMoc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tKQoreworICAgIGludCByYyA9 IDA7CisKKyAgICBpZiAoIGRvbS0+Y29uc29sZV9ldnRjaG4gPT0gSU5WQUxJRF9FVlRDSE4gKQor ICAgIHsKKyAgICAgICAgeGNfZG9tX3BhbmljKGRvbS0+eGNoLCBYQ19JTlZBTElEX1BBUkFNLAor ICAgICAgICAgICAgICAgICAgICAgIiVzOiBDYWxsZXIgZGlkbid0IHNldCBkb20tPmNvbnNvbGVf ZXZ0Y2huIiwgX19mdW5jX18pOworICAgICAgICByYyA9IC0xOworICAgIH0KKyAgICBpZiAoIGRv bS0+Y29uc29sZV9kb21pZCA9PSBJTlZBTElEX0RPTUlEICkKKyAgICB7CisgICAgICAgIHhjX2Rv bV9wYW5pYyhkb20tPnhjaCwgWENfSU5WQUxJRF9QQVJBTSwKKyAgICAgICAgICAgICAgICAgICAg ICIlczogQ2FsbGVyIGRpZG4ndCBzZXQgZG9tLT5jb25zb2xlX2RvbWlkIiwgX19mdW5jX18pOwor ICAgICAgICByYyA9IC0xOworICAgIH0KKworICAgIGlmICggZG9tLT54ZW5zdG9yZV9ldnRjaG4g PT0gSU5WQUxJRF9FVlRDSE4gKQorICAgIHsKKyAgICAgICAgeGNfZG9tX3BhbmljKGRvbS0+eGNo LCBYQ19JTlZBTElEX1BBUkFNLAorICAgICAgICAgICAgICAgICAgICAgIiVzOiBDYWxsZXIgZGlk bid0IHNldCBkb20tPnhlbnN0b3JlX2V2dGNobiIsIF9fZnVuY19fKTsKKyAgICAgICAgcmMgPSAt MTsKKyAgICB9CisgICAgaWYgKCBkb20tPnhlbnN0b3JlX2RvbWlkID09IElOVkFMSURfRE9NSUQg KQorICAgIHsKKyAgICAgICAgeGNfZG9tX3BhbmljKGRvbS0+eGNoLCBYQ19JTlZBTElEX1BBUkFN LAorICAgICAgICAgICAgICAgICAgICAgIiVzOiBDYWxsZXIgZGlkbid0IHNldCBkb20tPnhlbnN0 b3JlX2RvbWlkIiwgX19mdW5jX18pOworICAgICAgICByYyA9IC0xOworICAgIH0KKworICAgIHJl dHVybiByYzsKK30KKwogaW50IHhjX2RvbV9ib290X2ltYWdlKHN0cnVjdCB4Y19kb21faW1hZ2Ug KmRvbSkKIHsKICAgICB4Y19kb21pbmZvX3QgaW5mbzsKQEAgLTE3MCw2ICsyMDMsOSBAQCBpbnQg eGNfZG9tX2Jvb3RfaW1hZ2Uoc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tKQogCiAgICAgRE9NUFJJ TlRGX0NBTExFRChkb20tPnhjaCk7CiAKKyAgICBpZiAoIChyYyA9IHhjX2RvbV9jaGVja19yZXF1 aXJlZF9maWVsZHMoZG9tKSkgIT0gMCApCisgICAgICAgIHJldHVybiByYzsKKwogICAgIC8qIG1p c2Mgc3R1ZmYqLwogICAgIGlmICggKHJjID0gZG9tLT5hcmNoX2hvb2tzLT5ib290ZWFybHkoZG9t KSkgIT0gMCApCiAgICAgICAgIHJldHVybiByYzsKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhjL3hj X2RvbV9jb21wYXRfbGludXguYyBiL3Rvb2xzL2xpYnhjL3hjX2RvbV9jb21wYXRfbGludXguYwpp bmRleCA2ZDI3ZWMyLi4yYWQ0M2U0IDEwMDY0NAotLS0gYS90b29scy9saWJ4Yy94Y19kb21fY29t cGF0X2xpbnV4LmMKKysrIGIvdG9vbHMvbGlieGMveGNfZG9tX2NvbXBhdF9saW51eC5jCkBAIC02 MSw3ICs2MSw5IEBAIGludCB4Y19saW51eF9idWlsZCh4Y19pbnRlcmZhY2UgKnhjaCwgdWludDMy X3QgZG9taWQsCiAKICAgICBkb20tPmZsYWdzIHw9IGZsYWdzOwogICAgIGRvbS0+Y29uc29sZV9l dnRjaG4gPSBjb25zb2xlX2V2dGNobjsKKyAgICBkb20tPmNvbnNvbGVfZG9taWQgPSAwOwogICAg IGRvbS0+eGVuc3RvcmVfZXZ0Y2huID0gc3RvcmVfZXZ0Y2huOworICAgIGRvbS0+eGVuc3RvcmVf ZG9taWQgPSAwOwogCiAgICAgaWYgKCAocmMgPSB4Y19kb21fYm9vdF94ZW5faW5pdChkb20sIHhj aCwgZG9taWQpKSAhPSAwICkKICAgICAgICAgZ290byBvdXQ7CmRpZmYgLS1naXQgYS90b29scy9s aWJ4Yy94Y19kb21fY29yZS5jIGIvdG9vbHMvbGlieGMveGNfZG9tX2NvcmUuYwppbmRleCBiNWYz MTZhLi43MDg3YzUwIDEwMDY0NAotLS0gYS90b29scy9saWJ4Yy94Y19kb21fY29yZS5jCisrKyBi L3Rvb2xzL2xpYnhjL3hjX2RvbV9jb3JlLmMKQEAgLTc3OSw2ICs3NzksMTEgQEAgc3RydWN0IHhj X2RvbV9pbWFnZSAqeGNfZG9tX2FsbG9jYXRlKHhjX2ludGVyZmFjZSAqeGNoLAogICAgIGRvbS0+ cGFybXMuZWxmX3BhZGRyX29mZnNldCA9IFVOU0VUX0FERFI7CiAgICAgZG9tLT5wYXJtcy5wMm1f YmFzZSA9IFVOU0VUX0FERFI7CiAKKyAgICBkb20tPmNvbnNvbGVfZXZ0Y2huID0gSU5WQUxJRF9F VlRDSE47CisgICAgZG9tLT54ZW5zdG9yZV9ldnRjaG4gPSBJTlZBTElEX0VWVENITjsKKyAgICBk b20tPmNvbnNvbGVfZG9taWQgPSBJTlZBTElEX0RPTUlEOworICAgIGRvbS0+eGVuc3RvcmVfZG9t aWQgPSBJTlZBTElEX0RPTUlEOworCiAgICAgZG9tLT5mbGFncyA9IFNJRl9WSVJUX1AyTV80VE9P TFM7CiAKICAgICBkb20tPmFsbG9jX21hbGxvYyArPSBzaXplb2YoKmRvbSk7CmRpZmYgLS1naXQg YS90b29scy9saWJ4Yy94Y19kb21feDg2LmMgYi90b29scy9saWJ4Yy94Y19kb21feDg2LmMKaW5k ZXggYWEwY2VkMS4uMDVmNGI4MCAxMDA2NDQKLS0tIGEvdG9vbHMvbGlieGMveGNfZG9tX3g4Ni5j CisrKyBiL3Rvb2xzL2xpYnhjL3hjX2RvbV94ODYuYwpAQCAtNjE3LDYgKzYxNyw4IEBAIHN0YXRp YyBpbnQgYWxsb2NfbWFnaWNfcGFnZXNfaHZtKHN0cnVjdCB4Y19kb21faW1hZ2UgKmRvbSkKICAg ICBkb20tPnhlbnN0b3JlX2dmbiA9IHNwZWNpYWxfcGZuKFNQRUNJQUxQQUdFX1hFTlNUT1JFKTsK ICAgICB4Y19jbGVhcl9kb21haW5fcGFnZShkb20tPnhjaCwgZG9tLT5ndWVzdF9kb21pZCwgZG9t LT54ZW5zdG9yZV9nZm4pOwogICAgIHhjX2h2bV9wYXJhbV9zZXQoeGNoLCBkb21pZCwgSFZNX1BB UkFNX1NUT1JFX1BGTiwgZG9tLT54ZW5zdG9yZV9nZm4pOworICAgIHhjX2h2bV9wYXJhbV9zZXQo ZG9tLT54Y2gsIGRvbS0+Z3Vlc3RfZG9taWQsIEhWTV9QQVJBTV9TVE9SRV9FVlRDSE4sCisgICAg ICAgICAgICAgICAgICAgICBkb20tPnhlbnN0b3JlX2V2dGNobik7CiAKICAgICB4Y19odm1fcGFy YW1fc2V0KHhjaCwgZG9taWQsIEhWTV9QQVJBTV9CVUZJT1JFUV9QRk4sCiAgICAgICAgICAgICAg ICAgICAgICBzcGVjaWFsX3BmbihTUEVDSUFMUEFHRV9CVUZJT1JFUSkpOwpAQCAtNjI2LDYgKzYy OCw4IEBAIHN0YXRpYyBpbnQgYWxsb2NfbWFnaWNfcGFnZXNfaHZtKHN0cnVjdCB4Y19kb21faW1h Z2UgKmRvbSkKICAgICBkb20tPmNvbnNvbGVfZ2ZuID0gc3BlY2lhbF9wZm4oU1BFQ0lBTFBBR0Vf Q09OU09MRSk7CiAgICAgeGNfY2xlYXJfZG9tYWluX3BhZ2UoZG9tLT54Y2gsIGRvbS0+Z3Vlc3Rf ZG9taWQsIGRvbS0+Y29uc29sZV9nZm4pOwogICAgIHhjX2h2bV9wYXJhbV9zZXQoeGNoLCBkb21p ZCwgSFZNX1BBUkFNX0NPTlNPTEVfUEZOLCBkb20tPmNvbnNvbGVfZ2ZuKTsKKyAgICB4Y19odm1f cGFyYW1fc2V0KGRvbS0+eGNoLCBkb20tPmd1ZXN0X2RvbWlkLCBIVk1fUEFSQU1fQ09OU09MRV9F VlRDSE4sCisgICAgICAgICAgICAgICAgICAgICBkb20tPmNvbnNvbGVfZXZ0Y2huKTsKIAogICAg IHhjX2h2bV9wYXJhbV9zZXQoeGNoLCBkb21pZCwgSFZNX1BBUkFNX1BBR0lOR19SSU5HX1BGTiwK ICAgICAgICAgICAgICAgICAgICAgIHNwZWNpYWxfcGZuKFNQRUNJQUxQQUdFX1BBR0lORykpOwpk aWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwvbGlieGxfZG9tLmMgYi90b29scy9saWJ4bC9saWJ4bF9k b20uYwppbmRleCAwMzg5YTA2Li5mY2RlZWYwIDEwMDY0NAotLS0gYS90b29scy9saWJ4bC9saWJ4 bF9kb20uYworKysgYi90b29scy9saWJ4bC9saWJ4bF9kb20uYwpAQCAtODYyLDE0ICs4NjIsMTAg QEAgaW50IGxpYnhsX19idWlsZF9wdihsaWJ4bF9fZ2MgKmdjLCB1aW50MzJfdCBkb21pZCwKIH0K IAogc3RhdGljIGludCBodm1fYnVpbGRfc2V0X3BhcmFtcyh4Y19pbnRlcmZhY2UgKmhhbmRsZSwg dWludDMyX3QgZG9taWQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGxpYnhsX2Rv bWFpbl9idWlsZF9pbmZvICppbmZvLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBp bnQgc3RvcmVfZXZ0Y2huLCB1bnNpZ25lZCBsb25nICpzdG9yZV9tZm4sCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGludCBjb25zb2xlX2V2dGNobiwgdW5zaWduZWQgbG9uZyAqY29u c29sZV9tZm4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRvbWlkX3Qgc3RvcmVf ZG9taWQsIGRvbWlkX3QgY29uc29sZV9kb21pZCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbGlieGxfZG9tYWluX2J1aWxkX2luZm8gKmluZm8pCiB7CiAgICAgc3RydWN0IGh2bV9p bmZvX3RhYmxlICp2YV9odm07CiAgICAgdWludDhfdCAqdmFfbWFwLCBzdW07Ci0gICAgdWludDY0 X3Qgc3RyX21mbiwgY29uc19tZm47CiAgICAgaW50IGk7CiAKICAgICBpZiAoaW5mby0+dHlwZSA9 PSBMSUJYTF9ET01BSU5fVFlQRV9IVk0pIHsKQEAgLTg5MCwxNSArODg2LDYgQEAgc3RhdGljIGlu dCBodm1fYnVpbGRfc2V0X3BhcmFtcyh4Y19pbnRlcmZhY2UgKmhhbmRsZSwgdWludDMyX3QgZG9t aWQsCiAgICAgICAgIG11bm1hcCh2YV9tYXAsIFhDX1BBR0VfU0laRSk7CiAgICAgfQogCi0gICAg eGNfaHZtX3BhcmFtX2dldChoYW5kbGUsIGRvbWlkLCBIVk1fUEFSQU1fU1RPUkVfUEZOLCAmc3Ry X21mbik7Ci0gICAgeGNfaHZtX3BhcmFtX2dldChoYW5kbGUsIGRvbWlkLCBIVk1fUEFSQU1fQ09O U09MRV9QRk4sICZjb25zX21mbik7Ci0gICAgeGNfaHZtX3BhcmFtX3NldChoYW5kbGUsIGRvbWlk LCBIVk1fUEFSQU1fU1RPUkVfRVZUQ0hOLCBzdG9yZV9ldnRjaG4pOwotICAgIHhjX2h2bV9wYXJh bV9zZXQoaGFuZGxlLCBkb21pZCwgSFZNX1BBUkFNX0NPTlNPTEVfRVZUQ0hOLCBjb25zb2xlX2V2 dGNobik7Ci0KLSAgICAqc3RvcmVfbWZuID0gc3RyX21mbjsKLSAgICAqY29uc29sZV9tZm4gPSBj b25zX21mbjsKLQotICAgIHhjX2RvbV9nbnR0YWJfaHZtX3NlZWQoaGFuZGxlLCBkb21pZCwgKmNv bnNvbGVfbWZuLCAqc3RvcmVfbWZuLCBjb25zb2xlX2RvbWlkLCBzdG9yZV9kb21pZCk7CiAgICAg cmV0dXJuIDA7CiB9CiAKQEAgLTExNTksNiArMTE0NiwxMSBAQCBpbnQgbGlieGxfX2J1aWxkX2h2 bShsaWJ4bF9fZ2MgKmdjLCB1aW50MzJfdCBkb21pZCwKIAogICAgIGRvbS0+Y29udGFpbmVyX3R5 cGUgPSBYQ19ET01fSFZNX0NPTlRBSU5FUjsKIAorICAgIGRvbS0+Y29uc29sZV9ldnRjaG4gPSBz dGF0ZS0+Y29uc29sZV9wb3J0OworICAgIGRvbS0+Y29uc29sZV9kb21pZCA9IHN0YXRlLT5jb25z b2xlX2RvbWlkOworICAgIGRvbS0+eGVuc3RvcmVfZXZ0Y2huID0gc3RhdGUtPnN0b3JlX3BvcnQ7 CisgICAgZG9tLT54ZW5zdG9yZV9kb21pZCA9IHN0YXRlLT5zdG9yZV9kb21pZDsKKwogICAgIC8q IFRoZSBwYXJhbXMgZnJvbSB0aGUgY29uZmlndXJhdGlvbiBmaWxlIGFyZSBpbiBNYiwgd2hpY2gg YXJlIHRoZW4KICAgICAgKiBtdWx0aXBsaWVkIGJ5IDEgS2IuIFRoaXMgd2FzIHRoZW4gZGl2aWRl ZCBvZmYgd2hlbiBjYWxsaW5nCiAgICAgICogdGhlIG9sZCB4Y19odm1fYnVpbGRfdGFyZ2V0X21l bSgpIHdoaWNoIHRoZW4gdHVybmVkIHRoZW0gdG8gYnl0ZXMuCkBAIC0xMjYzLDEwICsxMjU1LDcg QEAgaW50IGxpYnhsX19idWlsZF9odm0obGlieGxfX2djICpnYywgdWludDMyX3QgZG9taWQsCiAg ICAgICAgIGdvdG8gb3V0OwogICAgIH0KIAotICAgIHJjID0gaHZtX2J1aWxkX3NldF9wYXJhbXMo Y3R4LT54Y2gsIGRvbWlkLCBpbmZvLCBzdGF0ZS0+c3RvcmVfcG9ydCwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAmc3RhdGUtPnN0b3JlX21mbiwgc3RhdGUtPmNvbnNvbGVfcG9ydCwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmc3RhdGUtPmNvbnNvbGVfbWZuLCBzdGF0 ZS0+c3RvcmVfZG9taWQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RhdGUtPmNv bnNvbGVfZG9taWQpOworICAgIHJjID0gaHZtX2J1aWxkX3NldF9wYXJhbXMoY3R4LT54Y2gsIGRv bWlkLCBpbmZvKTsKICAgICBpZiAocmMgIT0gMCkgewogICAgICAgICBMT0coRVJST1IsICJodm0g YnVpbGQgc2V0IHBhcmFtcyBmYWlsZWQiKTsKICAgICAgICAgZ290byBvdXQ7CkBAIC0xMjc4LDYg KzEyNjcsOSBAQCBpbnQgbGlieGxfX2J1aWxkX2h2bShsaWJ4bF9fZ2MgKmdjLCB1aW50MzJfdCBk b21pZCwKICAgICAgICAgZ290byBvdXQ7CiAgICAgfQogCisgICAgc3RhdGUtPmNvbnNvbGVfbWZu ID0gZG9tLT5jb25zb2xlX2dmbjsKKyAgICBzdGF0ZS0+c3RvcmVfbWZuID0gZG9tLT54ZW5zdG9y ZV9nZm47CisKICAgICB4Y19kb21fcmVsZWFzZShkb20pOwogICAgIHJldHVybiAwOwogCmRpZmYg LS1naXQgYS90b29scy9saWJ4bC9saWJ4bF9pbnRlcm5hbC5oIGIvdG9vbHMvbGlieGwvbGlieGxf aW50ZXJuYWwuaAppbmRleCBiY2I2YjBhLi44YThlZjRhIDEwMDY0NAotLS0gYS90b29scy9saWJ4 bC9saWJ4bF9pbnRlcm5hbC5oCisrKyBiL3Rvb2xzL2xpYnhsL2xpYnhsX2ludGVybmFsLmgKQEAg LTExNSw3ICsxMTUsNiBAQAogI2RlZmluZSBTVFVCRE9NX1NQRUNJQUxfQ09OU09MRVMgMwogI2Rl ZmluZSBUQVBfREVWSUNFX1NVRkZJWCAiLWVtdSIKICNkZWZpbmUgRE9NSURfWFNfUEFUSCAiZG9t aWQiCi0jZGVmaW5lIElOVkFMSURfRE9NSUQgfjAKIAogLyogU2l6ZSBtYWNyb3MuICovCiAjZGVm aW5lIF9fQUMoWCxZKSAgIChYIyNZKQotLSAKMi4xLjQKCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZl bEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK