From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrew Cooper <andrew.cooper3@citrix.com>
Subject: [PATCH for-4.10 v2 4/5] tools/dombuilder: Fix asymmetry
	when setting up console and xenstore rings
Date: Thu, 12 Oct 2017 20:19:08 +0100
Message-ID: <1507835949-9429-5-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: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1507835949-9429-1-git-send-email-andrew.cooper3@citrix.com>
List-Unsubscribe: <https://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
 <mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <https://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
 <mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Errors-To: xen-devel-bounces@lists.xen.org
Sender: "Xen-devel" <xen-devel-bounces@lists.xen.org>
To: Xen-devel <xen-devel@lists.xen.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>, Julien Grall <julien.grall@arm.com>, Ian Jackson <Ian.Jackson@eu.citrix.com>
List-Id: xen-devel@lists.xenproject.org

bGlieGwgYWx3YXlzIHVzZXMgeGNfZG9tX2dudHRhYl9pbml0KCksIHdoaWNoIGludGVybmFsbHkg
Y2FsbHMKeGNfZG9tX2dudHRhYntfaHZtLH1fc2VlZCgpIHRvIHNldCB1cCB0aGUgZ3JhbnRzIHBv
aW50IGF0IHRoZSBjb25zb2xlIGFuZAp4ZW5zdG9yZSByaW5ncy4gIEZvciBIVk0gZ3Vlc3RzLCBs
aWJ4bCB0aGVuIGFza3MgWGVuIGZvciB0aGUgaW5mb3JtYXRpb24gc2V0CnVwIHByZXZpb3VzbHks
IGFuZCBjYWxscyB4Y19kb21fZ250dGFiX2h2bV9zZWVkKCkgYSBzZWNvbmQgdGltZSwgd2hpY2gg
aXMKd2FzdGVmdWwuICBBUk0gY29uc3RydWN0aW9uIGV4cGVjdHMgbGlieGwgdG8gaGF2ZSBzZXQg
dXAKZG9tLT57Y29uc29sZSx4ZW5zdG9yZX1fZXZ0Y2huIGVhcmxpZXIsIHNvIG9ubHkgYWN0dWFs
bHkgZnVuY3Rpb25zIGJlY2F1c2Ugb2YKdGhpcyBzZWNvbmQgY2FsbC4KClJhdGlvbmFsaXNlIGV2
ZXJ5dGhpbmcgYW5kIG1ha2UgaXQgY29uc2lzdGVudCBmb3IgYWxsIGd1ZXN0cy4KCiAxKSBVc2Vy
cyBvZiB0aGUgZG9tYWluIGJ1aWxkZXIgYXJlIGV4cGVjdGVkIHRvIHByb3ZpZGUKICAgIGRvbS0+
e2NvbnNvbGUseGVuc3RvcmV9X3tldnRjaG4sZG9taWR9IHVuY29uZGl0aW9uYWxseS4gIFRoaXMg
aXMgY2hlY2tlZAogICAgYnkgc2V0dGluZyBpbnZhbGlkIHZhbHVlcyBpbiB4Y19kb21fYWxsb2Nh
dGUoKSwgYW5kIGNoZWNraW5nIGluCiAgICB4Y19kb21fYm9vdF9pbWFnZSgpLgoKIDIpIEZvciB4
ODYgSFZNIGFuZCBBUk0gZ3Vlc3RzLCB0aGUgZXZlbnQgY2hhbm5lbHMgYXJlIGdpdmVuIHRvIFhl
biBhdCB0aGUKICAgIHNhbWUgdGltZSBhcyB0aGUgcmluZyBnZm5zLiAgQVJNIGFscmVhZHkgZGlk
IHRoaXMsIGJ1dCB4ODYgaXMgdXBkYXRlZCB0bwogICAgbWF0Y2guICB4ODYgUFYgYWxyZWFkeSBw
cm92aWRlcyB0aGlzIGluZm9ybWF0aW9uIGluIHRoZSBzdGFydF9pbmZvIHBhZ2UuCgogMykgTGli
eGwgaXMgdXBkYXRlZCB0byBkcm9wIGFsbCByZWxldmFudCBmdW5jdGlvbmFsaXR5IGZyb20KICAg
IGh2bV9idWlsZF9zZXRfcGFyYW1zKCksIGFuZCBiZWhhdmUgY29uc2lzdGVudGx5IHdpdGggUFYg
Z3Vlc3RzIHdoZW4gaXQKICAgIGNvbWVzIHRvIHRoZSBoYW5kbGluZyBvZiBkb20tPntjb25zb2xl
LHhlbnN0b3JlfV97ZXZ0Y2huLGRvbWlkLGdmbn0uCgpUaGlzIHJlbW92ZXMgc2V2ZXJhbCByZWR1
bmRhbnQgaHlwZXJjYWxscyAoaW5jbHVkaW5nIGEgZm9yZWlnbiBtYXBwaW5nKSBmcm9tCnRoZSB4
ODYgSFZNIGFuZCBBUk0gY29uc3RydWN0aW9uIHBhdGhzLgoKU2lnbmVkLW9mZi1ieTogQW5kcmV3
IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KUmV2aWV3ZWQtYnk6IFJvZ2VyIFBh
dSBNb25uw6kgPHJvZ2VyLnBhdUBjaXRyaXguY29tPgpBY2tlZC1ieTogV2VpIExpdSA8d2VpLmxp
dTJAY2l0cml4LmNvbT4KVGVzdGVkLWJ5OiBKdWxpZW4gR3JhbGwgPGp1bGllbi5ncmFsbEBhcm0u
Y29tPgotLS0KQ0M6IElhbiBKYWNrc29uIDxJYW4uSmFja3NvbkBldS5jaXRyaXguY29tPgpDQzog
SnVsaWVuIEdyYWxsIDxqdWxpZW4uZ3JhbGxAYXJtLmNvbT4KCnYyOgogKiB1c2UgfjAgZm9yIElO
VkFMSURfRE9NSUQgdG8gYXZvaWQKICAgWy1XZXJyb3IsLVd0YXV0b2xvZ2ljYWwtY29uc3RhbnQt
b3V0LW9mLXJhbmdlLWNvbXBhcmVdIGZyb20gQ2xhbmcKICogU2V0IGVycm5vIHRvIEVJTlZBTCBp
biB4Y19kb21fY2hlY2tfcmVxdWlyZWRfZmllbGRzKCkKLS0tCiB0b29scy9saWJ4Yy9pbmNsdWRl
L3hjX2RvbS5oICAgICAgfCAxMiArKysrKysrKy0tLS0KIHRvb2xzL2xpYnhjL3hjX2RvbV9hcm0u
YyAgICAgICAgICB8ICAyICstCiB0b29scy9saWJ4Yy94Y19kb21fYm9vdC5jICAgICAgICAgfCAz
OSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIHRvb2xzL2xpYnhjL3hj
X2RvbV9jb21wYXRfbGludXguYyB8ICAyICsrCiB0b29scy9saWJ4Yy94Y19kb21fY29yZS5jICAg
ICAgICAgfCAgNSArKysrKwogdG9vbHMvbGlieGMveGNfZG9tX3g4Ni5jICAgICAgICAgIHwgIDQg
KysrKwogdG9vbHMvbGlieGwvbGlieGxfZG9tLmMgICAgICAgICAgIHwgMjggKysrKysrKysrKy0t
LS0tLS0tLS0tLS0tLS0tLQogdG9vbHMvbGlieGwvbGlieGxfaW50ZXJuYWwuaCAgICAgIHwgIDEg
LQogOCBmaWxlcyBjaGFuZ2VkLCA2OSBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkKCmRp
ZmYgLS1naXQgYS90b29scy9saWJ4Yy9pbmNsdWRlL3hjX2RvbS5oIGIvdG9vbHMvbGlieGMvaW5j
bHVkZS94Y19kb20uaAppbmRleCA1OTA3NTU5Li5hMWMzZGUyIDEwMDY0NAotLS0gYS90b29scy9s
aWJ4Yy9pbmNsdWRlL3hjX2RvbS5oCisrKyBiL3Rvb2xzL2xpYnhjL2luY2x1ZGUveGNfZG9tLmgK
QEAgLTIwLDYgKzIwLDggQEAKICNpbmNsdWRlIDx4ZW5ndWVzdC5oPgogCiAjZGVmaW5lIElOVkFM
SURfUEZOICgoeGVuX3Bmbl90KS0xKQorI2RlZmluZSBJTlZBTElEX0VWVENITiAofjB1KQorI2Rl
ZmluZSBJTlZBTElEX0RPTUlEICAofjApCiAjZGVmaW5lIFg4Nl9IVk1fTlJfU1BFQ0lBTF9QQUdF
UyAgICA4CiAjZGVmaW5lIFg4Nl9IVk1fRU5EX1NQRUNJQUxfUkVHSU9OICAweGZmMDAwdQogCkBA
IC0xMDQsMTAgKzEwNiwxNiBAQCBzdHJ1Y3QgeGNfZG9tX2ltYWdlIHsKICAgICAgKiBEZXRhaWxz
IGZvciB0aGUgdG9vbHN0YWNrLXByZXBhcmVkIHJpbmdzLgogICAgICAqCiAgICAgICogKl9nZm4g
ZmllbGRzIGFyZSBhbGxvY2F0ZWQgYnkgdGhlIGRvbWFpbiBidWlsZGVyLgorICAgICAqICpfe2V2
dGNobixkb21pZH0gZmllbGRzIG11c3QgYmUgcHJvdmlkZWQgYnkgdGhlIGNhbGxlci4KICAgICAg
Ki8KICAgICB4ZW5fcGZuX3QgY29uc29sZV9nZm47CiAgICAgeGVuX3Bmbl90IHhlbnN0b3JlX2dm
bjsKIAorICAgIHVuc2lnbmVkIGludCBjb25zb2xlX2V2dGNobjsKKyAgICB1bnNpZ25lZCBpbnQg
eGVuc3RvcmVfZXZ0Y2huOworICAgIHVpbnQzMl90IGNvbnNvbGVfZG9taWQ7CisgICAgdWludDMy
X3QgeGVuc3RvcmVfZG9taWQ7CisKICAgICAvKgogICAgICAqIGluaXRyZCBwYXJhbWV0ZXJzIGFz
IHNwZWNpZmllZCBpbiBzdGFydF9pbmZvIHBhZ2UKICAgICAgKiBEZXBlbmRpbmcgb24gY2FwYWJp
bGl0aWVzIG9mIHRoZSBib290ZWQga2VybmVsIHRoaXMgbWF5IGJlIGEgdmlydHVhbApAQCAtMTY1
LDEwICsxNzMsNiBAQCBzdHJ1Y3QgeGNfZG9tX2ltYWdlIHsKIAogICAgIC8qIG1pc2MgeGVuIGRv
bWFpbiBjb25maWcgc3R1ZmYgKi8KICAgICB1bnNpZ25lZCBsb25nIGZsYWdzOwotICAgIHVuc2ln
bmVkIGludCBjb25zb2xlX2V2dGNobjsKLSAgICB1bnNpZ25lZCBpbnQgeGVuc3RvcmVfZXZ0Y2hu
OwotICAgIHVpbnQzMl90IGNvbnNvbGVfZG9taWQ7Ci0gICAgdWludDMyX3QgeGVuc3RvcmVfZG9t
aWQ7CiAgICAgeGVuX3Bmbl90IHNoYXJlZF9pbmZvX21mbjsKIAogICAgIHhjX2ludGVyZmFjZSAq
eGNoOwpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGMveGNfZG9tX2FybS5jIGIvdG9vbHMvbGlieGMv
eGNfZG9tX2FybS5jCmluZGV4IDJmZTc1Y2QuLjIxMzRjZTQgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xp
YnhjL3hjX2RvbV9hcm0uYworKysgYi90b29scy9saWJ4Yy94Y19kb21fYXJtLmMKQEAgLTk5LDcg
Kzk5LDcgQEAgc3RhdGljIGludCBhbGxvY19tYWdpY19wYWdlcyhzdHJ1Y3QgeGNfZG9tX2ltYWdl
ICpkb20pCiAgICAgICAgICAgICBkb20tPnhlbnN0b3JlX2dmbik7CiAgICAgeGNfaHZtX3BhcmFt
X3NldChkb20tPnhjaCwgZG9tLT5ndWVzdF9kb21pZCwgSFZNX1BBUkFNX01PTklUT1JfUklOR19Q
Rk4sCiAgICAgICAgICAgICBiYXNlICsgTUVNQUNDRVNTX1BGTl9PRkZTRVQpOwotICAgIC8qIGFs
bG9jYXRlZCBieSB0b29sc3RhY2sgKi8KKwogICAgIHhjX2h2bV9wYXJhbV9zZXQoZG9tLT54Y2gs
IGRvbS0+Z3Vlc3RfZG9taWQsIEhWTV9QQVJBTV9DT05TT0xFX0VWVENITiwKICAgICAgICAgICAg
IGRvbS0+Y29uc29sZV9ldnRjaG4pOwogICAgIHhjX2h2bV9wYXJhbV9zZXQoZG9tLT54Y2gsIGRv
bS0+Z3Vlc3RfZG9taWQsIEhWTV9QQVJBTV9TVE9SRV9FVlRDSE4sCmRpZmYgLS1naXQgYS90b29s
cy9saWJ4Yy94Y19kb21fYm9vdC5jIGIvdG9vbHMvbGlieGMveGNfZG9tX2Jvb3QuYwppbmRleCBi
YmY5OGI2Li43NTgzNmJkIDEwMDY0NAotLS0gYS90b29scy9saWJ4Yy94Y19kb21fYm9vdC5jCisr
KyBiL3Rvb2xzL2xpYnhjL3hjX2RvbV9ib290LmMKQEAgLTE2Myw2ICsxNjMsNDIgQEAgdm9pZCAq
eGNfZG9tX2Jvb3RfZG9tVV9tYXAoc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tLCB4ZW5fcGZuX3Qg
cGZuLAogICAgIHJldHVybiBwdHI7CiB9CiAKK3N0YXRpYyBpbnQgeGNfZG9tX2NoZWNrX3JlcXVp
cmVkX2ZpZWxkcyhzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20pCit7CisgICAgaW50IHJjID0gMDsK
KworICAgIGlmICggZG9tLT5jb25zb2xlX2V2dGNobiA9PSBJTlZBTElEX0VWVENITiApCisgICAg
eworICAgICAgICB4Y19kb21fcGFuaWMoZG9tLT54Y2gsIFhDX0lOVkFMSURfUEFSQU0sCisgICAg
ICAgICAgICAgICAgICAgICAiJXM6IENhbGxlciBkaWRuJ3Qgc2V0IGRvbS0+Y29uc29sZV9ldnRj
aG4iLCBfX2Z1bmNfXyk7CisgICAgICAgIHJjID0gLTE7CisgICAgfQorICAgIGlmICggZG9tLT5j
b25zb2xlX2RvbWlkID09IElOVkFMSURfRE9NSUQgKQorICAgIHsKKyAgICAgICAgeGNfZG9tX3Bh
bmljKGRvbS0+eGNoLCBYQ19JTlZBTElEX1BBUkFNLAorICAgICAgICAgICAgICAgICAgICAgIiVz
OiBDYWxsZXIgZGlkbid0IHNldCBkb20tPmNvbnNvbGVfZG9taWQiLCBfX2Z1bmNfXyk7CisgICAg
ICAgIHJjID0gLTE7CisgICAgfQorCisgICAgaWYgKCBkb20tPnhlbnN0b3JlX2V2dGNobiA9PSBJ
TlZBTElEX0VWVENITiApCisgICAgeworICAgICAgICB4Y19kb21fcGFuaWMoZG9tLT54Y2gsIFhD
X0lOVkFMSURfUEFSQU0sCisgICAgICAgICAgICAgICAgICAgICAiJXM6IENhbGxlciBkaWRuJ3Qg
c2V0IGRvbS0+eGVuc3RvcmVfZXZ0Y2huIiwgX19mdW5jX18pOworICAgICAgICByYyA9IC0xOwor
ICAgIH0KKyAgICBpZiAoIGRvbS0+eGVuc3RvcmVfZG9taWQgPT0gSU5WQUxJRF9ET01JRCApCisg
ICAgeworICAgICAgICB4Y19kb21fcGFuaWMoZG9tLT54Y2gsIFhDX0lOVkFMSURfUEFSQU0sCisg
ICAgICAgICAgICAgICAgICAgICAiJXM6IENhbGxlciBkaWRuJ3Qgc2V0IGRvbS0+eGVuc3RvcmVf
ZG9taWQiLCBfX2Z1bmNfXyk7CisgICAgICAgIHJjID0gLTE7CisgICAgfQorCisgICAgaWYgKCBy
YyApCisgICAgICAgIGVycm5vID0gRUlOVkFMOworCisgICAgcmV0dXJuIHJjOworfQorCiBpbnQg
eGNfZG9tX2Jvb3RfaW1hZ2Uoc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tKQogewogICAgIHhjX2Rv
bWluZm9fdCBpbmZvOwpAQCAtMTcwLDYgKzIwNiw5IEBAIGludCB4Y19kb21fYm9vdF9pbWFnZShz
dHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20pCiAKICAgICBET01QUklOVEZfQ0FMTEVEKGRvbS0+eGNo
KTsKIAorICAgIGlmICggKHJjID0geGNfZG9tX2NoZWNrX3JlcXVpcmVkX2ZpZWxkcyhkb20pKSAh
PSAwICkKKyAgICAgICAgcmV0dXJuIHJjOworCiAgICAgLyogbWlzYyBzdHVmZiovCiAgICAgaWYg
KCAocmMgPSBkb20tPmFyY2hfaG9va3MtPmJvb3RlYXJseShkb20pKSAhPSAwICkKICAgICAgICAg
cmV0dXJuIHJjOwpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGMveGNfZG9tX2NvbXBhdF9saW51eC5j
IGIvdG9vbHMvbGlieGMveGNfZG9tX2NvbXBhdF9saW51eC5jCmluZGV4IDZkMjdlYzIuLjJhZDQz
ZTQgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhjL3hjX2RvbV9jb21wYXRfbGludXguYworKysgYi90
b29scy9saWJ4Yy94Y19kb21fY29tcGF0X2xpbnV4LmMKQEAgLTYxLDcgKzYxLDkgQEAgaW50IHhj
X2xpbnV4X2J1aWxkKHhjX2ludGVyZmFjZSAqeGNoLCB1aW50MzJfdCBkb21pZCwKIAogICAgIGRv
bS0+ZmxhZ3MgfD0gZmxhZ3M7CiAgICAgZG9tLT5jb25zb2xlX2V2dGNobiA9IGNvbnNvbGVfZXZ0
Y2huOworICAgIGRvbS0+Y29uc29sZV9kb21pZCA9IDA7CiAgICAgZG9tLT54ZW5zdG9yZV9ldnRj
aG4gPSBzdG9yZV9ldnRjaG47CisgICAgZG9tLT54ZW5zdG9yZV9kb21pZCA9IDA7CiAKICAgICBp
ZiAoIChyYyA9IHhjX2RvbV9ib290X3hlbl9pbml0KGRvbSwgeGNoLCBkb21pZCkpICE9IDAgKQog
ICAgICAgICBnb3RvIG91dDsKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhjL3hjX2RvbV9jb3JlLmMg
Yi90b29scy9saWJ4Yy94Y19kb21fY29yZS5jCmluZGV4IGI1ZjMxNmEuLjcwODdjNTAgMTAwNjQ0
Ci0tLSBhL3Rvb2xzL2xpYnhjL3hjX2RvbV9jb3JlLmMKKysrIGIvdG9vbHMvbGlieGMveGNfZG9t
X2NvcmUuYwpAQCAtNzc5LDYgKzc3OSwxMSBAQCBzdHJ1Y3QgeGNfZG9tX2ltYWdlICp4Y19kb21f
YWxsb2NhdGUoeGNfaW50ZXJmYWNlICp4Y2gsCiAgICAgZG9tLT5wYXJtcy5lbGZfcGFkZHJfb2Zm
c2V0ID0gVU5TRVRfQUREUjsKICAgICBkb20tPnBhcm1zLnAybV9iYXNlID0gVU5TRVRfQUREUjsK
IAorICAgIGRvbS0+Y29uc29sZV9ldnRjaG4gPSBJTlZBTElEX0VWVENITjsKKyAgICBkb20tPnhl
bnN0b3JlX2V2dGNobiA9IElOVkFMSURfRVZUQ0hOOworICAgIGRvbS0+Y29uc29sZV9kb21pZCA9
IElOVkFMSURfRE9NSUQ7CisgICAgZG9tLT54ZW5zdG9yZV9kb21pZCA9IElOVkFMSURfRE9NSUQ7
CisKICAgICBkb20tPmZsYWdzID0gU0lGX1ZJUlRfUDJNXzRUT09MUzsKIAogICAgIGRvbS0+YWxs
b2NfbWFsbG9jICs9IHNpemVvZigqZG9tKTsKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhjL3hjX2Rv
bV94ODYuYyBiL3Rvb2xzL2xpYnhjL3hjX2RvbV94ODYuYwppbmRleCBjNzRmYjk2Li5lMjY4NTdk
IDEwMDY0NAotLS0gYS90b29scy9saWJ4Yy94Y19kb21feDg2LmMKKysrIGIvdG9vbHMvbGlieGMv
eGNfZG9tX3g4Ni5jCkBAIC02MTcsNiArNjE3LDggQEAgc3RhdGljIGludCBhbGxvY19tYWdpY19w
YWdlc19odm0oc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tKQogICAgIGRvbS0+eGVuc3RvcmVfZ2Zu
ID0gc3BlY2lhbF9wZm4oU1BFQ0lBTFBBR0VfWEVOU1RPUkUpOwogICAgIHhjX2NsZWFyX2RvbWFp
bl9wYWdlKGRvbS0+eGNoLCBkb20tPmd1ZXN0X2RvbWlkLCBkb20tPnhlbnN0b3JlX2dmbik7CiAg
ICAgeGNfaHZtX3BhcmFtX3NldCh4Y2gsIGRvbWlkLCBIVk1fUEFSQU1fU1RPUkVfUEZOLCBkb20t
PnhlbnN0b3JlX2dmbik7CisgICAgeGNfaHZtX3BhcmFtX3NldChkb20tPnhjaCwgZG9tLT5ndWVz
dF9kb21pZCwgSFZNX1BBUkFNX1NUT1JFX0VWVENITiwKKyAgICAgICAgICAgICAgICAgICAgIGRv
bS0+eGVuc3RvcmVfZXZ0Y2huKTsKIAogICAgIHhjX2h2bV9wYXJhbV9zZXQoeGNoLCBkb21pZCwg
SFZNX1BBUkFNX0JVRklPUkVRX1BGTiwKICAgICAgICAgICAgICAgICAgICAgIHNwZWNpYWxfcGZu
KFNQRUNJQUxQQUdFX0JVRklPUkVRKSk7CkBAIC02MjYsNiArNjI4LDggQEAgc3RhdGljIGludCBh
bGxvY19tYWdpY19wYWdlc19odm0oc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tKQogICAgIGRvbS0+
Y29uc29sZV9nZm4gPSBzcGVjaWFsX3BmbihTUEVDSUFMUEFHRV9DT05TT0xFKTsKICAgICB4Y19j
bGVhcl9kb21haW5fcGFnZShkb20tPnhjaCwgZG9tLT5ndWVzdF9kb21pZCwgZG9tLT5jb25zb2xl
X2dmbik7CiAgICAgeGNfaHZtX3BhcmFtX3NldCh4Y2gsIGRvbWlkLCBIVk1fUEFSQU1fQ09OU09M
RV9QRk4sIGRvbS0+Y29uc29sZV9nZm4pOworICAgIHhjX2h2bV9wYXJhbV9zZXQoZG9tLT54Y2gs
IGRvbS0+Z3Vlc3RfZG9taWQsIEhWTV9QQVJBTV9DT05TT0xFX0VWVENITiwKKyAgICAgICAgICAg
ICAgICAgICAgIGRvbS0+Y29uc29sZV9ldnRjaG4pOwogCiAgICAgeGNfaHZtX3BhcmFtX3NldCh4
Y2gsIGRvbWlkLCBIVk1fUEFSQU1fUEFHSU5HX1JJTkdfUEZOLAogICAgICAgICAgICAgICAgICAg
ICAgc3BlY2lhbF9wZm4oU1BFQ0lBTFBBR0VfUEFHSU5HKSk7CmRpZmYgLS1naXQgYS90b29scy9s
aWJ4bC9saWJ4bF9kb20uYyBiL3Rvb2xzL2xpYnhsL2xpYnhsX2RvbS5jCmluZGV4IDAzODlhMDYu
LmZjZGVlZjAgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhsL2xpYnhsX2RvbS5jCisrKyBiL3Rvb2xz
L2xpYnhsL2xpYnhsX2RvbS5jCkBAIC04NjIsMTQgKzg2MiwxMCBAQCBpbnQgbGlieGxfX2J1aWxk
X3B2KGxpYnhsX19nYyAqZ2MsIHVpbnQzMl90IGRvbWlkLAogfQogCiBzdGF0aWMgaW50IGh2bV9i
dWlsZF9zZXRfcGFyYW1zKHhjX2ludGVyZmFjZSAqaGFuZGxlLCB1aW50MzJfdCBkb21pZCwKLSAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbGlieGxfZG9tYWluX2J1aWxkX2luZm8gKmlu
Zm8sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCBzdG9yZV9ldnRjaG4sIHVu
c2lnbmVkIGxvbmcgKnN0b3JlX21mbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
aW50IGNvbnNvbGVfZXZ0Y2huLCB1bnNpZ25lZCBsb25nICpjb25zb2xlX21mbiwKLSAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgZG9taWRfdCBzdG9yZV9kb21pZCwgZG9taWRfdCBjb25z
b2xlX2RvbWlkKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBsaWJ4bF9kb21haW5f
YnVpbGRfaW5mbyAqaW5mbykKIHsKICAgICBzdHJ1Y3QgaHZtX2luZm9fdGFibGUgKnZhX2h2bTsK
ICAgICB1aW50OF90ICp2YV9tYXAsIHN1bTsKLSAgICB1aW50NjRfdCBzdHJfbWZuLCBjb25zX21m
bjsKICAgICBpbnQgaTsKIAogICAgIGlmIChpbmZvLT50eXBlID09IExJQlhMX0RPTUFJTl9UWVBF
X0hWTSkgewpAQCAtODkwLDE1ICs4ODYsNiBAQCBzdGF0aWMgaW50IGh2bV9idWlsZF9zZXRfcGFy
YW1zKHhjX2ludGVyZmFjZSAqaGFuZGxlLCB1aW50MzJfdCBkb21pZCwKICAgICAgICAgbXVubWFw
KHZhX21hcCwgWENfUEFHRV9TSVpFKTsKICAgICB9CiAKLSAgICB4Y19odm1fcGFyYW1fZ2V0KGhh
bmRsZSwgZG9taWQsIEhWTV9QQVJBTV9TVE9SRV9QRk4sICZzdHJfbWZuKTsKLSAgICB4Y19odm1f
cGFyYW1fZ2V0KGhhbmRsZSwgZG9taWQsIEhWTV9QQVJBTV9DT05TT0xFX1BGTiwgJmNvbnNfbWZu
KTsKLSAgICB4Y19odm1fcGFyYW1fc2V0KGhhbmRsZSwgZG9taWQsIEhWTV9QQVJBTV9TVE9SRV9F
VlRDSE4sIHN0b3JlX2V2dGNobik7Ci0gICAgeGNfaHZtX3BhcmFtX3NldChoYW5kbGUsIGRvbWlk
LCBIVk1fUEFSQU1fQ09OU09MRV9FVlRDSE4sIGNvbnNvbGVfZXZ0Y2huKTsKLQotICAgICpzdG9y
ZV9tZm4gPSBzdHJfbWZuOwotICAgICpjb25zb2xlX21mbiA9IGNvbnNfbWZuOwotCi0gICAgeGNf
ZG9tX2dudHRhYl9odm1fc2VlZChoYW5kbGUsIGRvbWlkLCAqY29uc29sZV9tZm4sICpzdG9yZV9t
Zm4sIGNvbnNvbGVfZG9taWQsIHN0b3JlX2RvbWlkKTsKICAgICByZXR1cm4gMDsKIH0KIApAQCAt
MTE1OSw2ICsxMTQ2LDExIEBAIGludCBsaWJ4bF9fYnVpbGRfaHZtKGxpYnhsX19nYyAqZ2MsIHVp
bnQzMl90IGRvbWlkLAogCiAgICAgZG9tLT5jb250YWluZXJfdHlwZSA9IFhDX0RPTV9IVk1fQ09O
VEFJTkVSOwogCisgICAgZG9tLT5jb25zb2xlX2V2dGNobiA9IHN0YXRlLT5jb25zb2xlX3BvcnQ7
CisgICAgZG9tLT5jb25zb2xlX2RvbWlkID0gc3RhdGUtPmNvbnNvbGVfZG9taWQ7CisgICAgZG9t
LT54ZW5zdG9yZV9ldnRjaG4gPSBzdGF0ZS0+c3RvcmVfcG9ydDsKKyAgICBkb20tPnhlbnN0b3Jl
X2RvbWlkID0gc3RhdGUtPnN0b3JlX2RvbWlkOworCiAgICAgLyogVGhlIHBhcmFtcyBmcm9tIHRo
ZSBjb25maWd1cmF0aW9uIGZpbGUgYXJlIGluIE1iLCB3aGljaCBhcmUgdGhlbgogICAgICAqIG11
bHRpcGxpZWQgYnkgMSBLYi4gVGhpcyB3YXMgdGhlbiBkaXZpZGVkIG9mZiB3aGVuIGNhbGxpbmcK
ICAgICAgKiB0aGUgb2xkIHhjX2h2bV9idWlsZF90YXJnZXRfbWVtKCkgd2hpY2ggdGhlbiB0dXJu
ZWQgdGhlbSB0byBieXRlcy4KQEAgLTEyNjMsMTAgKzEyNTUsNyBAQCBpbnQgbGlieGxfX2J1aWxk
X2h2bShsaWJ4bF9fZ2MgKmdjLCB1aW50MzJfdCBkb21pZCwKICAgICAgICAgZ290byBvdXQ7CiAg
ICAgfQogCi0gICAgcmMgPSBodm1fYnVpbGRfc2V0X3BhcmFtcyhjdHgtPnhjaCwgZG9taWQsIGlu
Zm8sIHN0YXRlLT5zdG9yZV9wb3J0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZz
dGF0ZS0+c3RvcmVfbWZuLCBzdGF0ZS0+Y29uc29sZV9wb3J0LAotICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICZzdGF0ZS0+Y29uc29sZV9tZm4sIHN0YXRlLT5zdG9yZV9kb21pZCwKLSAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0ZS0+Y29uc29sZV9kb21pZCk7CisgICAg
cmMgPSBodm1fYnVpbGRfc2V0X3BhcmFtcyhjdHgtPnhjaCwgZG9taWQsIGluZm8pOwogICAgIGlm
IChyYyAhPSAwKSB7CiAgICAgICAgIExPRyhFUlJPUiwgImh2bSBidWlsZCBzZXQgcGFyYW1zIGZh
aWxlZCIpOwogICAgICAgICBnb3RvIG91dDsKQEAgLTEyNzgsNiArMTI2Nyw5IEBAIGludCBsaWJ4
bF9fYnVpbGRfaHZtKGxpYnhsX19nYyAqZ2MsIHVpbnQzMl90IGRvbWlkLAogICAgICAgICBnb3Rv
IG91dDsKICAgICB9CiAKKyAgICBzdGF0ZS0+Y29uc29sZV9tZm4gPSBkb20tPmNvbnNvbGVfZ2Zu
OworICAgIHN0YXRlLT5zdG9yZV9tZm4gPSBkb20tPnhlbnN0b3JlX2dmbjsKKwogICAgIHhjX2Rv
bV9yZWxlYXNlKGRvbSk7CiAgICAgcmV0dXJuIDA7CiAKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhs
L2xpYnhsX2ludGVybmFsLmggYi90b29scy9saWJ4bC9saWJ4bF9pbnRlcm5hbC5oCmluZGV4IDQ1
ZTZkZjYuLjA2YTdmMzIgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhsL2xpYnhsX2ludGVybmFsLmgK
KysrIGIvdG9vbHMvbGlieGwvbGlieGxfaW50ZXJuYWwuaApAQCAtMTE3LDcgKzExNyw2IEBACiAj
ZGVmaW5lIFNUVUJET01fU1BFQ0lBTF9DT05TT0xFUyAzCiAjZGVmaW5lIFRBUF9ERVZJQ0VfU1VG
RklYICItZW11IgogI2RlZmluZSBET01JRF9YU19QQVRIICJkb21pZCIKLSNkZWZpbmUgSU5WQUxJ
RF9ET01JRCB+MAogCiAvKiBTaXplIG1hY3Jvcy4gKi8KICNkZWZpbmUgX19BQyhYLFkpICAgKFgj
I1kpCi0tIAoyLjEuNAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0
cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=