From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrew Cooper <andrew.cooper3@citrix.com>
Subject: [PATCH for-4.10 v2 3/5] tools/dombuilder: Switch to
	using gfn terminology for console and xenstore rings
Date: Thu, 12 Oct 2017 20:19:07 +0100
Message-ID: <1507835949-9429-4-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

VGhlIHNvbGUgdXNlIG9mIHhjX2RvbV90cmFuc2xhdGVkKCkgYW5kIHhjX2RvbV9wMm0oKSBvdXRz
aWRlIG9mIHRoZSBkb21haW4KYnVpbGRlciBpcyBmb3IgbGlieGxfZG9tKCkgdG8gdHJhbnNsYXRl
IHRoZSBjb25zb2xlIGFuZCB4ZW5zdG9yZSBwZm5zIGJhY2sKaW50byB1c2VmdWwgdmFsdWVzLiAg
UFYgZ3Vlc3QgcGZucyBhcmUgb25seSBpbnRlcmVzdGluZyB0byB0aGUgZG9tYWluIGJ1aWxkZXIs
CmFuZCBnZm5zIGFyZSB0aGUgYWRkcmVzcyBzcGFjZSB1c2VkIGJ5IGFsbCBvdGhlciBoeXBlcmNh
bGxzLgoKUmVuYW1pbmcgdGhlIGZpZWxkcyBpbiB4Y19kb21faW1hZ2UgaXMgZGVsaWJlcmF0ZSwg
YXMgaXQgd2lsbCBjYXVzZQpvdXQtb2YtdHJlZSB1c2VycyBvZiB0aGUgZG9tYnVpbGRlciB0byBu
b3RpY2UgdGhlIGRpZmZlcmVudCBzZW1hbnRpY3MuCgpDb3JyZWN0IHRoZSB0ZXJtaW5vbG9neSB0
aHJvdWdob3V0IHhjX2RvbV9nbnR0YWJ7X2h2bSx9X3NlZWQoKSwgd2hpY2ggYXJlIGFsbAp1c2lu
ZyBnZm5zIGRlc3BpdGUgdGhlIGV4aXN0aW5nIHZhcmlhYmxlIG5hbWVzLgoKU2lnbmVkLW9mZi1i
eTogQW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KUmV2aWV3ZWQtYnk6
IFJvZ2VyIFBhdSBNb25uw6kgPHJvZ2VyLnBhdUBjaXRyaXguY29tPgpBY2tlZC1ieTogV2VpIExp
dSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KVGVzdGVkLWJ5OiBKdWxpZW4gR3JhbGwgPGp1bGllbi5n
cmFsbEBhcm0uY29tPgotLS0KQ0M6IElhbiBKYWNrc29uIDxJYW4uSmFja3NvbkBldS5jaXRyaXgu
Y29tPgpDQzogSnVsaWVuIEdyYWxsIDxqdWxpZW4uZ3JhbGxAYXJtLmNvbT4KCnYyOgogKiBNb3Jl
IHN0eWxlIGZpeGVzCi0tLQogdG9vbHMvbGlieGMvaW5jbHVkZS94Y19kb20uaCAgICAgIHwgMTAg
KysrKysrKy0tCiB0b29scy9saWJ4Yy94Y19kb21fYXJtLmMgICAgICAgICAgfCAxMiArKysrKy0t
LS0tLQogdG9vbHMvbGlieGMveGNfZG9tX2Jvb3QuYyAgICAgICAgIHwgNDUgKysrKysrKysrKysr
KysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiB0b29scy9saWJ4Yy94Y19kb21fY29tcGF0X2xp
bnV4LmMgfCAgNCArKy0tCiB0b29scy9saWJ4Yy94Y19kb21feDg2LmMgICAgICAgICAgfCA0NSAr
KysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIHRvb2xzL2xpYnhsL2xpYnhs
X2RvbS5jICAgICAgICAgICB8IDExICsrKy0tLS0tLS0KIDYgZmlsZXMgY2hhbmdlZCwgNjMgaW5z
ZXJ0aW9ucygrKSwgNjQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGMvaW5j
bHVkZS94Y19kb20uaCBiL3Rvb2xzL2xpYnhjL2luY2x1ZGUveGNfZG9tLmgKaW5kZXggY2RjZGQw
Ny4uNTkwNzU1OSAxMDA2NDQKLS0tIGEvdG9vbHMvbGlieGMvaW5jbHVkZS94Y19kb20uaAorKysg
Yi90b29scy9saWJ4Yy9pbmNsdWRlL3hjX2RvbS5oCkBAIC05NCw4ICs5NCw2IEBAIHN0cnVjdCB4
Y19kb21faW1hZ2UgewogICAgIHN0cnVjdCB4Y19kb21fc2VnIGRldmljZXRyZWVfc2VnOwogICAg
IHN0cnVjdCB4Y19kb21fc2VnIHN0YXJ0X2luZm9fc2VnOyAvKiBIVk1saXRlIG9ubHkgKi8KICAg
ICB4ZW5fcGZuX3Qgc3RhcnRfaW5mb19wZm47Ci0gICAgeGVuX3Bmbl90IGNvbnNvbGVfcGZuOwot
ICAgIHhlbl9wZm5fdCB4ZW5zdG9yZV9wZm47CiAgICAgeGVuX3Bmbl90IHNoYXJlZF9pbmZvX3Bm
bjsKICAgICB4ZW5fcGZuX3QgYm9vdHN0YWNrX3BmbjsKICAgICB4ZW5fcGZuX3QgcGZuX2FsbG9j
X2VuZDsKQEAgLTEwMyw2ICsxMDEsMTQgQEAgc3RydWN0IHhjX2RvbV9pbWFnZSB7CiAgICAgeGVu
X3ZhZGRyX3QgYnNkX3N5bXRhYl9zdGFydDsKIAogICAgIC8qCisgICAgICogRGV0YWlscyBmb3Ig
dGhlIHRvb2xzdGFjay1wcmVwYXJlZCByaW5ncy4KKyAgICAgKgorICAgICAqICpfZ2ZuIGZpZWxk
cyBhcmUgYWxsb2NhdGVkIGJ5IHRoZSBkb21haW4gYnVpbGRlci4KKyAgICAgKi8KKyAgICB4ZW5f
cGZuX3QgY29uc29sZV9nZm47CisgICAgeGVuX3Bmbl90IHhlbnN0b3JlX2dmbjsKKworICAgIC8q
CiAgICAgICogaW5pdHJkIHBhcmFtZXRlcnMgYXMgc3BlY2lmaWVkIGluIHN0YXJ0X2luZm8gcGFn
ZQogICAgICAqIERlcGVuZGluZyBvbiBjYXBhYmlsaXRpZXMgb2YgdGhlIGJvb3RlZCBrZXJuZWwg
dGhpcyBtYXkgYmUgYSB2aXJ0dWFsCiAgICAgICogYWRkcmVzcyBvciBhIHBmbi4gVHlwZSBpcyBu
ZXV0cmFsIGFuZCBsYXJnZSBlbm91Z2ggdG8gaG9sZCBhIHZpcnR1YWwKZGlmZiAtLWdpdCBhL3Rv
b2xzL2xpYnhjL3hjX2RvbV9hcm0uYyBiL3Rvb2xzL2xpYnhjL3hjX2RvbV9hcm0uYwppbmRleCBm
Y2UxNTFkLi4yZmU3NWNkIDEwMDY0NAotLS0gYS90b29scy9saWJ4Yy94Y19kb21fYXJtLmMKKysr
IGIvdG9vbHMvbGlieGMveGNfZG9tX2FybS5jCkBAIC04NCwxOSArODQsMTkgQEAgc3RhdGljIGlu
dCBhbGxvY19tYWdpY19wYWdlcyhzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20pCiAgICAgaWYgKCBy
YyA8IDAgKQogICAgICAgICByZXR1cm4gcmM7CiAKLSAgICBkb20tPmNvbnNvbGVfcGZuID0gYmFz
ZSArIENPTlNPTEVfUEZOX09GRlNFVDsKLSAgICBkb20tPnhlbnN0b3JlX3BmbiA9IGJhc2UgKyBY
RU5TVE9SRV9QRk5fT0ZGU0VUOworICAgIGRvbS0+Y29uc29sZV9nZm4gPSBiYXNlICsgQ09OU09M
RV9QRk5fT0ZGU0VUOworICAgIGRvbS0+eGVuc3RvcmVfZ2ZuID0gYmFzZSArIFhFTlNUT1JFX1BG
Tl9PRkZTRVQ7CiAgICAgZG9tLT52dWFydF9nZm4gPSBiYXNlICsgVlVBUlRfUEZOX09GRlNFVDsK
IAotICAgIHhjX2NsZWFyX2RvbWFpbl9wYWdlKGRvbS0+eGNoLCBkb20tPmd1ZXN0X2RvbWlkLCBk
b20tPmNvbnNvbGVfcGZuKTsKLSAgICB4Y19jbGVhcl9kb21haW5fcGFnZShkb20tPnhjaCwgZG9t
LT5ndWVzdF9kb21pZCwgZG9tLT54ZW5zdG9yZV9wZm4pOworICAgIHhjX2NsZWFyX2RvbWFpbl9w
YWdlKGRvbS0+eGNoLCBkb20tPmd1ZXN0X2RvbWlkLCBkb20tPmNvbnNvbGVfZ2ZuKTsKKyAgICB4
Y19jbGVhcl9kb21haW5fcGFnZShkb20tPnhjaCwgZG9tLT5ndWVzdF9kb21pZCwgZG9tLT54ZW5z
dG9yZV9nZm4pOwogICAgIHhjX2NsZWFyX2RvbWFpbl9wYWdlKGRvbS0+eGNoLCBkb20tPmd1ZXN0
X2RvbWlkLCBiYXNlICsgTUVNQUNDRVNTX1BGTl9PRkZTRVQpOwogICAgIHhjX2NsZWFyX2RvbWFp
bl9wYWdlKGRvbS0+eGNoLCBkb20tPmd1ZXN0X2RvbWlkLCBkb20tPnZ1YXJ0X2dmbik7CiAKICAg
ICB4Y19odm1fcGFyYW1fc2V0KGRvbS0+eGNoLCBkb20tPmd1ZXN0X2RvbWlkLCBIVk1fUEFSQU1f
Q09OU09MRV9QRk4sCi0gICAgICAgICAgICBkb20tPmNvbnNvbGVfcGZuKTsKKyAgICAgICAgICAg
IGRvbS0+Y29uc29sZV9nZm4pOwogICAgIHhjX2h2bV9wYXJhbV9zZXQoZG9tLT54Y2gsIGRvbS0+
Z3Vlc3RfZG9taWQsIEhWTV9QQVJBTV9TVE9SRV9QRk4sCi0gICAgICAgICAgICBkb20tPnhlbnN0
b3JlX3Bmbik7CisgICAgICAgICAgICBkb20tPnhlbnN0b3JlX2dmbik7CiAgICAgeGNfaHZtX3Bh
cmFtX3NldChkb20tPnhjaCwgZG9tLT5ndWVzdF9kb21pZCwgSFZNX1BBUkFNX01PTklUT1JfUklO
R19QRk4sCiAgICAgICAgICAgICBiYXNlICsgTUVNQUNDRVNTX1BGTl9PRkZTRVQpOwogICAgIC8q
IGFsbG9jYXRlZCBieSB0b29sc3RhY2sgKi8KZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhjL3hjX2Rv
bV9ib290LmMgYi90b29scy9saWJ4Yy94Y19kb21fYm9vdC5jCmluZGV4IDJlNTY4MWQuLmJiZjk4
YjYgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhjL3hjX2RvbV9ib290LmMKKysrIGIvdG9vbHMvbGli
eGMveGNfZG9tX2Jvb3QuYwpAQCAtMjU3LDI0ICsyNTcsMjMgQEAgc3RhdGljIHhlbl9wZm5fdCB4
Y19kb21fZ250dGFiX3NldHVwKHhjX2ludGVyZmFjZSAqeGNoLCB1aW50MzJfdCBkb21pZCkKIH0K
IAogaW50IHhjX2RvbV9nbnR0YWJfc2VlZCh4Y19pbnRlcmZhY2UgKnhjaCwgdWludDMyX3QgZG9t
aWQsCi0gICAgICAgICAgICAgICAgICAgICAgIHhlbl9wZm5fdCBjb25zb2xlX2dtZm4sCi0gICAg
ICAgICAgICAgICAgICAgICAgIHhlbl9wZm5fdCB4ZW5zdG9yZV9nbWZuLAorICAgICAgICAgICAg
ICAgICAgICAgICB4ZW5fcGZuX3QgY29uc29sZV9nZm4sCisgICAgICAgICAgICAgICAgICAgICAg
IHhlbl9wZm5fdCB4ZW5zdG9yZV9nZm4sCiAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90
IGNvbnNvbGVfZG9taWQsCiAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90IHhlbnN0b3Jl
X2RvbWlkKQogewotCi0gICAgeGVuX3Bmbl90IGdudHRhYl9nbWZuOworICAgIHhlbl9wZm5fdCBn
bnR0YWJfZ2ZuOwogICAgIGdyYW50X2VudHJ5X3YxX3QgKmdudHRhYjsKIAotICAgIGdudHRhYl9n
bWZuID0geGNfZG9tX2dudHRhYl9zZXR1cCh4Y2gsIGRvbWlkKTsKLSAgICBpZiAoIGdudHRhYl9n
bWZuID09IC0xICkKKyAgICBnbnR0YWJfZ2ZuID0geGNfZG9tX2dudHRhYl9zZXR1cCh4Y2gsIGRv
bWlkKTsKKyAgICBpZiAoIGdudHRhYl9nZm4gPT0gLTEgKQogICAgICAgICByZXR1cm4gLTE7CiAK
ICAgICBnbnR0YWIgPSB4Y19tYXBfZm9yZWlnbl9yYW5nZSh4Y2gsCiAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgZG9taWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgUEFHRV9TSVpFLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBST1RfUkVB
RHxQUk9UX1dSSVRFLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdudHRhYl9n
bWZuKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnbnR0YWJfZ2ZuKTsKICAg
ICBpZiAoIGdudHRhYiA9PSBOVUxMICkKICAgICB7CiAgICAgICAgIHhjX2RvbV9wYW5pYyh4Y2gs
IFhDX0lOVEVSTkFMX0VSUk9SLApAQCAtMjg0LDE3ICsyODMsMTcgQEAgaW50IHhjX2RvbV9nbnR0
YWJfc2VlZCh4Y19pbnRlcmZhY2UgKnhjaCwgdWludDMyX3QgZG9taWQsCiAgICAgICAgIHJldHVy
biAtMTsKICAgICB9CiAKLSAgICBpZiAoIGRvbWlkICE9IGNvbnNvbGVfZG9taWQgICYmIGNvbnNv
bGVfZ21mbiAhPSAtMSkKKyAgICBpZiAoIGRvbWlkICE9IGNvbnNvbGVfZG9taWQgJiYgY29uc29s
ZV9nZm4gIT0gLTEgKQogICAgIHsKICAgICAgICAgZ250dGFiW0dOVFRBQl9SRVNFUlZFRF9DT05T
T0xFXS5mbGFncyA9IEdURl9wZXJtaXRfYWNjZXNzOwogICAgICAgICBnbnR0YWJbR05UVEFCX1JF
U0VSVkVEX0NPTlNPTEVdLmRvbWlkID0gY29uc29sZV9kb21pZDsKLSAgICAgICAgZ250dGFiW0dO
VFRBQl9SRVNFUlZFRF9DT05TT0xFXS5mcmFtZSA9IGNvbnNvbGVfZ21mbjsKKyAgICAgICAgZ250
dGFiW0dOVFRBQl9SRVNFUlZFRF9DT05TT0xFXS5mcmFtZSA9IGNvbnNvbGVfZ2ZuOwogICAgIH0K
LSAgICBpZiAoIGRvbWlkICE9IHhlbnN0b3JlX2RvbWlkICYmIHhlbnN0b3JlX2dtZm4gIT0gLTEp
CisgICAgaWYgKCBkb21pZCAhPSB4ZW5zdG9yZV9kb21pZCAmJiB4ZW5zdG9yZV9nZm4gIT0gLTEg
KQogICAgIHsKICAgICAgICAgZ250dGFiW0dOVFRBQl9SRVNFUlZFRF9YRU5TVE9SRV0uZmxhZ3Mg
PSBHVEZfcGVybWl0X2FjY2VzczsKICAgICAgICAgZ250dGFiW0dOVFRBQl9SRVNFUlZFRF9YRU5T
VE9SRV0uZG9taWQgPSB4ZW5zdG9yZV9kb21pZDsKLSAgICAgICAgZ250dGFiW0dOVFRBQl9SRVNF
UlZFRF9YRU5TVE9SRV0uZnJhbWUgPSB4ZW5zdG9yZV9nbWZuOworICAgICAgICBnbnR0YWJbR05U
VEFCX1JFU0VSVkVEX1hFTlNUT1JFXS5mcmFtZSA9IHhlbnN0b3JlX2dmbjsKICAgICB9CiAKICAg
ICBpZiAoIG11bm1hcChnbnR0YWIsIFBBR0VfU0laRSkgPT0gLTEgKQpAQCAtMzA4LDE5ICszMDcs
MTkgQEAgaW50IHhjX2RvbV9nbnR0YWJfc2VlZCh4Y19pbnRlcmZhY2UgKnhjaCwgdWludDMyX3Qg
ZG9taWQsCiAKICAgICAvKiBHdWVzdCBzaG91bGRuJ3QgcmVhbGx5IHRvdWNoIGl0cyBncmFudCB0
YWJsZSB1bnRpbCBpdCBoYXMKICAgICAgKiBlbmFibGVkIGl0cyBjYWNoZXMuIEJ1dCBsZXRzIGJl
IG5pY2UuICovCi0gICAgeGNfZG9tYWluX2NhY2hlZmx1c2goeGNoLCBkb21pZCwgZ250dGFiX2dt
Zm4sIDEpOworICAgIHhjX2RvbWFpbl9jYWNoZWZsdXNoKHhjaCwgZG9taWQsIGdudHRhYl9nZm4s
IDEpOwogCiAgICAgcmV0dXJuIDA7CiB9CiAKIGludCB4Y19kb21fZ250dGFiX2h2bV9zZWVkKHhj
X2ludGVyZmFjZSAqeGNoLCB1aW50MzJfdCBkb21pZCwKLSAgICAgICAgICAgICAgICAgICAgICAg
ICAgIHhlbl9wZm5fdCBjb25zb2xlX2dwZm4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICB4
ZW5fcGZuX3QgeGVuc3RvcmVfZ3BmbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIHhlbl9w
Zm5fdCBjb25zb2xlX2dmbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIHhlbl9wZm5fdCB4
ZW5zdG9yZV9nZm4sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICB1aW50MzJfdCBjb25zb2xl
X2RvbWlkLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgdWludDMyX3QgeGVuc3RvcmVfZG9t
aWQpCiB7CiAgICAgaW50IHJjOwotICAgIHhlbl9wZm5fdCBzY3JhdGNoX2dwZm47CisgICAgeGVu
X3Bmbl90IHNjcmF0Y2hfZ2ZuOwogICAgIHN0cnVjdCB4ZW5fYWRkX3RvX3BoeXNtYXAgeGF0cCA9
IHsKICAgICAgICAgLmRvbWlkID0gZG9taWQsCiAgICAgICAgIC5zcGFjZSA9IFhFTk1BUFNQQUNF
X2dyYW50X3RhYmxlLApAQCAtMzMwLDcgKzMyOSw3IEBAIGludCB4Y19kb21fZ250dGFiX2h2bV9z
ZWVkKHhjX2ludGVyZmFjZSAqeGNoLCB1aW50MzJfdCBkb21pZCwKICAgICAgICAgLmRvbWlkID0g
ZG9taWQsCiAgICAgfTsKIAotICAgIHJjID0geGNfY29yZV9hcmNoX2dldF9zY3JhdGNoX2dwZm4o
eGNoLCBkb21pZCwgJnNjcmF0Y2hfZ3Bmbik7CisgICAgcmMgPSB4Y19jb3JlX2FyY2hfZ2V0X3Nj
cmF0Y2hfZ3Bmbih4Y2gsIGRvbWlkLCAmc2NyYXRjaF9nZm4pOwogICAgIGlmICggcmMgPCAwICkK
ICAgICB7CiAgICAgICAgIHhjX2RvbV9wYW5pYyh4Y2gsIFhDX0lOVEVSTkFMX0VSUk9SLApAQCAt
MzM5LDExICszMzgsMTAgQEAgaW50IHhjX2RvbV9nbnR0YWJfaHZtX3NlZWQoeGNfaW50ZXJmYWNl
ICp4Y2gsIHVpbnQzMl90IGRvbWlkLAogICAgICAgICAgICAgICAgICAgICAgX19GVU5DVElPTl9f
LCBlcnJubyk7CiAgICAgICAgIHJldHVybiAtMTsKICAgICB9Ci0gICAgeGF0cC5ncGZuID0gc2Ny
YXRjaF9ncGZuOwotICAgIHhyZnAuZ3BmbiA9IHNjcmF0Y2hfZ3BmbjsKKyAgICB4YXRwLmdwZm4g
PSB4cmZwLmdwZm4gPSBzY3JhdGNoX2dmbjsKIAotICAgIHhjX2RvbV9wcmludGYoeGNoLCAiJXM6
IGNhbGxlZCwgcGZuPTB4JSJQUklfeGVuX3BmbiwgX19GVU5DVElPTl9fLAotICAgICAgICAgICAg
ICAgICAgc2NyYXRjaF9ncGZuKTsKKyAgICB4Y19kb21fcHJpbnRmKHhjaCwgIiVzOiBjYWxsZWQs
IHNjcmF0Y2ggZ2ZuPTB4JSJQUklfeGVuX3BmbiwgX19GVU5DVElPTl9fLAorICAgICAgICAgICAg
ICAgICAgc2NyYXRjaF9nZm4pOwogCiAKICAgICByYyA9IGRvX21lbW9yeV9vcCh4Y2gsIFhFTk1F
TV9hZGRfdG9fcGh5c21hcCwgJnhhdHAsIHNpemVvZih4YXRwKSk7CkBAIC0zNTcsNyArMzU1LDcg
QEAgaW50IHhjX2RvbV9nbnR0YWJfaHZtX3NlZWQoeGNfaW50ZXJmYWNlICp4Y2gsIHVpbnQzMl90
IGRvbWlkLAogICAgIH0KIAogICAgIHJjID0geGNfZG9tX2dudHRhYl9zZWVkKHhjaCwgZG9taWQs
Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc29sZV9ncGZuLCB4ZW5zdG9yZV9ncGZu
LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnNvbGVfZ2ZuLCB4ZW5zdG9yZV9nZm4s
CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc29sZV9kb21pZCwgeGVuc3RvcmVfZG9t
aWQpOwogICAgIGlmIChyYyAhPSAwKQogICAgIHsKQEAgLTM4NSwxMiArMzgzLDExIEBAIGludCB4
Y19kb21fZ250dGFiX2luaXQoc3RydWN0IHhjX2RvbV9pbWFnZSAqZG9tKQogewogICAgIGlmICgg
eGNfZG9tX3RyYW5zbGF0ZWQoZG9tKSApIHsKICAgICAgICAgcmV0dXJuIHhjX2RvbV9nbnR0YWJf
aHZtX3NlZWQoZG9tLT54Y2gsIGRvbS0+Z3Vlc3RfZG9taWQsCi0gICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgIGRvbS0+Y29uc29sZV9wZm4sIGRvbS0+eGVuc3RvcmVfcGZuLAor
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkb20tPmNvbnNvbGVfZ2ZuLCBk
b20tPnhlbnN0b3JlX2dmbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ZG9tLT5jb25zb2xlX2RvbWlkLCBkb20tPnhlbnN0b3JlX2RvbWlkKTsKICAgICB9IGVsc2Ugewog
ICAgICAgICByZXR1cm4geGNfZG9tX2dudHRhYl9zZWVkKGRvbS0+eGNoLCBkb20tPmd1ZXN0X2Rv
bWlkLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHhjX2RvbV9wMm0oZG9tLCBk
b20tPmNvbnNvbGVfcGZuKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB4Y19k
b21fcDJtKGRvbSwgZG9tLT54ZW5zdG9yZV9wZm4pLAorICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgIGRvbS0+Y29uc29sZV9nZm4sIGRvbS0+eGVuc3RvcmVfZ2ZuLAogICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgIGRvbS0+Y29uc29sZV9kb21pZCwgZG9tLT54ZW5zdG9y
ZV9kb21pZCk7CiAgICAgfQogfQpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGMveGNfZG9tX2NvbXBh
dF9saW51eC5jIGIvdG9vbHMvbGlieGMveGNfZG9tX2NvbXBhdF9saW51eC5jCmluZGV4IGM5MjJj
NjEuLjZkMjdlYzIgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhjL3hjX2RvbV9jb21wYXRfbGludXgu
YworKysgYi90b29scy9saWJ4Yy94Y19kb21fY29tcGF0X2xpbnV4LmMKQEAgLTc4LDggKzc4LDgg
QEAgaW50IHhjX2xpbnV4X2J1aWxkKHhjX2ludGVyZmFjZSAqeGNoLCB1aW50MzJfdCBkb21pZCwK
ICAgICBpZiAoIChyYyA9IHhjX2RvbV9nbnR0YWJfaW5pdChkb20pKSAhPSAwKQogICAgICAgICBn
b3RvIG91dDsKIAotICAgICpjb25zb2xlX21mbiA9IHhjX2RvbV9wMm0oZG9tLCBkb20tPmNvbnNv
bGVfcGZuKTsKLSAgICAqc3RvcmVfbWZuID0geGNfZG9tX3AybShkb20sIGRvbS0+eGVuc3RvcmVf
cGZuKTsKKyAgICAqY29uc29sZV9tZm4gPSBkb20tPmNvbnNvbGVfZ2ZuOworICAgICpzdG9yZV9t
Zm4gPSBkb20tPnhlbnN0b3JlX2dmbjsKIAogIG91dDoKICAgICB4Y19kb21fcmVsZWFzZShkb20p
OwpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGMveGNfZG9tX3g4Ni5jIGIvdG9vbHMvbGlieGMveGNf
ZG9tX3g4Ni5jCmluZGV4IGJmZjY4YTAuLmM3NGZiOTYgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhj
L3hjX2RvbV94ODYuYworKysgYi90b29scy9saWJ4Yy94Y19kb21feDg2LmMKQEAgLTUzNiwyMSAr
NTM2LDIzIEBAIHN0YXRpYyBpbnQgYWxsb2NfcDJtX2xpc3RfeDg2XzY0KHN0cnVjdCB4Y19kb21f
aW1hZ2UgKmRvbSkKIAogc3RhdGljIGludCBhbGxvY19tYWdpY19wYWdlc19wdihzdHJ1Y3QgeGNf
ZG9tX2ltYWdlICpkb20pCiB7CisgICAgeGVuX3Bmbl90IHBmbjsKKwogICAgIGRvbS0+c3RhcnRf
aW5mb19wZm4gPSB4Y19kb21fYWxsb2NfcGFnZShkb20sICJzdGFydCBpbmZvIik7CiAgICAgaWYg
KCBkb20tPnN0YXJ0X2luZm9fcGZuID09IElOVkFMSURfUEZOICkKICAgICAgICAgcmV0dXJuIC0x
OwogCi0gICAgZG9tLT54ZW5zdG9yZV9wZm4gPSB4Y19kb21fYWxsb2NfcGFnZShkb20sICJ4ZW5z
dG9yZSIpOwotICAgIGlmICggZG9tLT54ZW5zdG9yZV9wZm4gPT0gSU5WQUxJRF9QRk4gKQorICAg
IHBmbiA9IHhjX2RvbV9hbGxvY19wYWdlKGRvbSwgInhlbnN0b3JlIik7CisgICAgaWYgKCBwZm4g
PT0gSU5WQUxJRF9QRk4gKQogICAgICAgICByZXR1cm4gLTE7Ci0gICAgeGNfY2xlYXJfZG9tYWlu
X3BhZ2UoZG9tLT54Y2gsIGRvbS0+Z3Vlc3RfZG9taWQsCi0gICAgICAgICAgICAgICAgICAgICAg
ICAgeGNfZG9tX3AybShkb20sIGRvbS0+eGVuc3RvcmVfcGZuKSk7CisgICAgZG9tLT54ZW5zdG9y
ZV9nZm4gPSB4Y19kb21fcDJtKGRvbSwgcGZuKTsKKyAgICB4Y19jbGVhcl9kb21haW5fcGFnZShk
b20tPnhjaCwgZG9tLT5ndWVzdF9kb21pZCwgZG9tLT54ZW5zdG9yZV9nZm4pOwogCi0gICAgZG9t
LT5jb25zb2xlX3BmbiA9IHhjX2RvbV9hbGxvY19wYWdlKGRvbSwgImNvbnNvbGUiKTsKLSAgICBp
ZiAoIGRvbS0+Y29uc29sZV9wZm4gPT0gSU5WQUxJRF9QRk4gKQorICAgIHBmbiA9IHhjX2RvbV9h
bGxvY19wYWdlKGRvbSwgImNvbnNvbGUiKTsKKyAgICBpZiAoIHBmbiA9PSBJTlZBTElEX1BGTiAp
CiAgICAgICAgIHJldHVybiAtMTsKLSAgICB4Y19jbGVhcl9kb21haW5fcGFnZShkb20tPnhjaCwg
ZG9tLT5ndWVzdF9kb21pZCwKLSAgICAgICAgICAgICAgICAgICAgICAgICB4Y19kb21fcDJtKGRv
bSwgZG9tLT5jb25zb2xlX3BmbikpOworICAgIGRvbS0+Y29uc29sZV9nZm4gPSB4Y19kb21fcDJt
KGRvbSwgcGZuKTsKKyAgICB4Y19jbGVhcl9kb21haW5fcGFnZShkb20tPnhjaCwgZG9tLT5ndWVz
dF9kb21pZCwgZG9tLT5jb25zb2xlX2dmbik7CiAKICAgICBkb20tPmFsbG9jX2Jvb3RzdGFjayA9
IDE7CiAKQEAgLTYxMiwxNCArNjE0LDE5IEBAIHN0YXRpYyBpbnQgYWxsb2NfbWFnaWNfcGFnZXNf
aHZtKHN0cnVjdCB4Y19kb21faW1hZ2UgKmRvbSkKICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICBYODZfSFZNX05SX1NQRUNJQUxfUEFHRVMpICkKICAgICAgICAgICAgIGdvdG8gZXJyb3Jf
b3V0OwogCi0gICAgeGNfaHZtX3BhcmFtX3NldCh4Y2gsIGRvbWlkLCBIVk1fUEFSQU1fU1RPUkVf
UEZOLAotICAgICAgICAgICAgICAgICAgICAgc3BlY2lhbF9wZm4oU1BFQ0lBTFBBR0VfWEVOU1RP
UkUpKTsKKyAgICBkb20tPnhlbnN0b3JlX2dmbiA9IHNwZWNpYWxfcGZuKFNQRUNJQUxQQUdFX1hF
TlNUT1JFKTsKKyAgICB4Y19jbGVhcl9kb21haW5fcGFnZShkb20tPnhjaCwgZG9tLT5ndWVzdF9k
b21pZCwgZG9tLT54ZW5zdG9yZV9nZm4pOworICAgIHhjX2h2bV9wYXJhbV9zZXQoeGNoLCBkb21p
ZCwgSFZNX1BBUkFNX1NUT1JFX1BGTiwgZG9tLT54ZW5zdG9yZV9nZm4pOworCiAgICAgeGNfaHZt
X3BhcmFtX3NldCh4Y2gsIGRvbWlkLCBIVk1fUEFSQU1fQlVGSU9SRVFfUEZOLAogICAgICAgICAg
ICAgICAgICAgICAgc3BlY2lhbF9wZm4oU1BFQ0lBTFBBR0VfQlVGSU9SRVEpKTsKICAgICB4Y19o
dm1fcGFyYW1fc2V0KHhjaCwgZG9taWQsIEhWTV9QQVJBTV9JT1JFUV9QRk4sCiAgICAgICAgICAg
ICAgICAgICAgICBzcGVjaWFsX3BmbihTUEVDSUFMUEFHRV9JT1JFUSkpOwotICAgIHhjX2h2bV9w
YXJhbV9zZXQoeGNoLCBkb21pZCwgSFZNX1BBUkFNX0NPTlNPTEVfUEZOLAotICAgICAgICAgICAg
ICAgICAgICAgc3BlY2lhbF9wZm4oU1BFQ0lBTFBBR0VfQ09OU09MRSkpOworCisgICAgZG9tLT5j
b25zb2xlX2dmbiA9IHNwZWNpYWxfcGZuKFNQRUNJQUxQQUdFX0NPTlNPTEUpOworICAgIHhjX2Ns
ZWFyX2RvbWFpbl9wYWdlKGRvbS0+eGNoLCBkb20tPmd1ZXN0X2RvbWlkLCBkb20tPmNvbnNvbGVf
Z2ZuKTsKKyAgICB4Y19odm1fcGFyYW1fc2V0KHhjaCwgZG9taWQsIEhWTV9QQVJBTV9DT05TT0xF
X1BGTiwgZG9tLT5jb25zb2xlX2dmbik7CisKICAgICB4Y19odm1fcGFyYW1fc2V0KHhjaCwgZG9t
aWQsIEhWTV9QQVJBTV9QQUdJTkdfUklOR19QRk4sCiAgICAgICAgICAgICAgICAgICAgICBzcGVj
aWFsX3BmbihTUEVDSUFMUEFHRV9QQUdJTkcpKTsKICAgICB4Y19odm1fcGFyYW1fc2V0KHhjaCwg
ZG9taWQsIEhWTV9QQVJBTV9NT05JVE9SX1JJTkdfUEZOLApAQCAtNjk5LDEyICs3MDYsNiBAQCBz
dGF0aWMgaW50IGFsbG9jX21hZ2ljX3BhZ2VzX2h2bShzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20p
CiAgICAgeGNfaHZtX3BhcmFtX3NldCh4Y2gsIGRvbWlkLCBIVk1fUEFSQU1fSURFTlRfUFQsCiAg
ICAgICAgICAgICAgICAgICAgICBzcGVjaWFsX3BmbihTUEVDSUFMUEFHRV9JREVOVF9QVCkgPDwg
UEFHRV9TSElGVCk7CiAKLSAgICBkb20tPmNvbnNvbGVfcGZuID0gc3BlY2lhbF9wZm4oU1BFQ0lB
TFBBR0VfQ09OU09MRSk7Ci0gICAgeGNfY2xlYXJfZG9tYWluX3BhZ2UoZG9tLT54Y2gsIGRvbS0+
Z3Vlc3RfZG9taWQsIGRvbS0+Y29uc29sZV9wZm4pOwotCi0gICAgZG9tLT54ZW5zdG9yZV9wZm4g
PSBzcGVjaWFsX3BmbihTUEVDSUFMUEFHRV9YRU5TVE9SRSk7Ci0gICAgeGNfY2xlYXJfZG9tYWlu
X3BhZ2UoZG9tLT54Y2gsIGRvbS0+Z3Vlc3RfZG9taWQsIGRvbS0+eGVuc3RvcmVfcGZuKTsKLQog
ICAgIGRvbS0+cGFybXMudmlydF9oeXBlcmNhbGwgPSAtMTsKIAogICAgIHJjID0gMDsKQEAgLTc0
NCw5ICs3NDUsOSBAQCBzdGF0aWMgaW50IHN0YXJ0X2luZm9feDg2XzMyKHN0cnVjdCB4Y19kb21f
aW1hZ2UgKmRvbSkKICAgICBzdGFydF9pbmZvLT5tZm5fbGlzdCA9IGRvbS0+cDJtX3NlZy52c3Rh
cnQ7CiAKICAgICBzdGFydF9pbmZvLT5mbGFncyA9IGRvbS0+ZmxhZ3M7Ci0gICAgc3RhcnRfaW5m
by0+c3RvcmVfbWZuID0geGNfZG9tX3AybShkb20sIGRvbS0+eGVuc3RvcmVfcGZuKTsKKyAgICBz
dGFydF9pbmZvLT5zdG9yZV9tZm4gPSBkb20tPnhlbnN0b3JlX2dmbjsKICAgICBzdGFydF9pbmZv
LT5zdG9yZV9ldnRjaG4gPSBkb20tPnhlbnN0b3JlX2V2dGNobjsKLSAgICBzdGFydF9pbmZvLT5j
b25zb2xlLmRvbVUubWZuID0geGNfZG9tX3AybShkb20sIGRvbS0+Y29uc29sZV9wZm4pOworICAg
IHN0YXJ0X2luZm8tPmNvbnNvbGUuZG9tVS5tZm4gPSBkb20tPmNvbnNvbGVfZ2ZuOwogICAgIHN0
YXJ0X2luZm8tPmNvbnNvbGUuZG9tVS5ldnRjaG4gPSBkb20tPmNvbnNvbGVfZXZ0Y2huOwogCiAg
ICAgaWYgKCBkb20tPnJhbWRpc2tfYmxvYiApCkBAIC03OTUsOSArNzk2LDkgQEAgc3RhdGljIGlu
dCBzdGFydF9pbmZvX3g4Nl82NChzdHJ1Y3QgeGNfZG9tX2ltYWdlICpkb20pCiAgICAgfQogCiAg
ICAgc3RhcnRfaW5mby0+ZmxhZ3MgPSBkb20tPmZsYWdzOwotICAgIHN0YXJ0X2luZm8tPnN0b3Jl
X21mbiA9IHhjX2RvbV9wMm0oZG9tLCBkb20tPnhlbnN0b3JlX3Bmbik7CisgICAgc3RhcnRfaW5m
by0+c3RvcmVfbWZuID0gZG9tLT54ZW5zdG9yZV9nZm47CiAgICAgc3RhcnRfaW5mby0+c3RvcmVf
ZXZ0Y2huID0gZG9tLT54ZW5zdG9yZV9ldnRjaG47Ci0gICAgc3RhcnRfaW5mby0+Y29uc29sZS5k
b21VLm1mbiA9IHhjX2RvbV9wMm0oZG9tLCBkb20tPmNvbnNvbGVfcGZuKTsKKyAgICBzdGFydF9p
bmZvLT5jb25zb2xlLmRvbVUubWZuID0gZG9tLT5jb25zb2xlX2dmbjsKICAgICBzdGFydF9pbmZv
LT5jb25zb2xlLmRvbVUuZXZ0Y2huID0gZG9tLT5jb25zb2xlX2V2dGNobjsKIAogICAgIGlmICgg
ZG9tLT5yYW1kaXNrX2Jsb2IgKQpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwvbGlieGxfZG9tLmMg
Yi90b29scy9saWJ4bC9saWJ4bF9kb20uYwppbmRleCBlZjgzNGU2Li4wMzg5YTA2IDEwMDY0NAot
LS0gYS90b29scy9saWJ4bC9saWJ4bF9kb20uYworKysgYi90b29scy9saWJ4bC9saWJ4bF9kb20u
YwpAQCAtODUxLDE0ICs4NTEsOSBAQCBpbnQgbGlieGxfX2J1aWxkX3B2KGxpYnhsX19nYyAqZ2Ms
IHVpbnQzMl90IGRvbWlkLAogICAgIGlmIChyZXQgIT0gMCkKICAgICAgICAgZ290byBvdXQ7CiAK
LSAgICBpZiAoeGNfZG9tX3RyYW5zbGF0ZWQoZG9tKSkgewotICAgICAgICBzdGF0ZS0+Y29uc29s
ZV9tZm4gPSBkb20tPmNvbnNvbGVfcGZuOwotICAgICAgICBzdGF0ZS0+c3RvcmVfbWZuID0gZG9t
LT54ZW5zdG9yZV9wZm47Ci0gICAgICAgIHN0YXRlLT52dWFydF9nZm4gPSBkb20tPnZ1YXJ0X2dm
bjsKLSAgICB9IGVsc2UgewotICAgICAgICBzdGF0ZS0+Y29uc29sZV9tZm4gPSB4Y19kb21fcDJt
KGRvbSwgZG9tLT5jb25zb2xlX3Bmbik7Ci0gICAgICAgIHN0YXRlLT5zdG9yZV9tZm4gPSB4Y19k
b21fcDJtKGRvbSwgZG9tLT54ZW5zdG9yZV9wZm4pOwotICAgIH0KKyAgICBzdGF0ZS0+Y29uc29s
ZV9tZm4gPSBkb20tPmNvbnNvbGVfZ2ZuOworICAgIHN0YXRlLT5zdG9yZV9tZm4gPSBkb20tPnhl
bnN0b3JlX2dmbjsKKyAgICBzdGF0ZS0+dnVhcnRfZ2ZuID0gZG9tLT52dWFydF9nZm47CiAKICAg
ICByZXQgPSAwOwogb3V0OgotLSAKMi4xLjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0
cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK