From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: [PULL 14/26] pci: removed the is_express field since a uniform interface was inserted Date: Thu, 8 Feb 2018 21:09:11 +0200 Message-ID: <1518116908-10852-15-git-send-email-mst@redhat.com> References: <1518116908-10852-1-git-send-email-mst@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ejrZQ-0004pm-42 for xen-devel@lists.xenproject.org; Thu, 08 Feb 2018 19:09:20 +0000 Content-Disposition: inline In-Reply-To: <1518116908-10852-1-git-send-email-mst@redhat.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Maydell , Hannes Reinecke , Dmitry Fleytman , Fam Zheng , Eduardo Habkost , qemu-block@nongnu.org, Yoni Bettan , Alex Williamson , Max Reitz , Keith Busch , Anthony Perard , Paul Burton , Stefano Stabellini , Gerd Hoffmann , xen-devel@lists.xenproject.org, Marcel Apfelbaum , Paolo Bonzini , Jason Wang List-Id: xen-devel@lists.xenproject.org RnJvbTogWW9uaSBCZXR0YW4gPHliZXR0YW5AcmVkaGF0LmNvbT4KCmFjY29yZGluZyB0byBFZHVh cmRvIEhhYmtvc3QncyBjb21taXQgZmQzYjAyYzg4OSBhbGwgUENJRXMgbm93IGltcGxlbWVudApJ TlRFUkZBQ0VfUENJRV9ERVZJQ0Ugc28gd2UgZG9uJ3QgbmVlZCBpc19leHByZXNzIGZpZWxkIGFu eW1vcmUuCgpEZXZpY2VzIHRoYXQgaW1wbGVtZW50cyBvbmx5IElOVEVSRkFDRV9QQ0lFX0RFVklD RSAoaXNfZXhwcmVzcyA9PSAxKQpvcgpkZXZpY2VzIHRoYXQgaW1wbGVtZW50cyBvbmx5IElOVEVS RkFDRV9DT05WRU5USU9OQUxfUENJX0RFVklDRSAoaXNfZXhwcmVzcyA9PSAwKQp3aGVyZSBub3Qg YWZmZWN0ZWQgYnkgdGhlIGNoYW5nZS4KClRoZSBvbmx5IGRldmljZXMgdGhhdCB3ZXJlIGFmZmVj dGVkIGFyZSB0aG9zZSB0aGF0IGFyZSBoeWJyaWQgYW5kIGFsc28KaGFkIChpc19leHByZXNzID09 IDEpIC0gdGhlcmVmb3Igb25seToKICAtIGh3L3ZmaW8vcGNpLmMKICAtIGh3L3VzYi9oY2QteGhj aS5jCiAgLSBody94ZW4veGVuX3B0LmMKCkZvciB0aG9zZSAzIEkgbWFkZSBzdXJlIHRoYXQgUUVN VV9QQ0lfQ0FQX0VYUFJFU1MgaXMgb24gaW4gaW5zdGFuY2VfaW5pdCgpCgpSZXZpZXdlZC1ieTog TWFyY2VsIEFwZmVsYmF1bSA8bWFyY2VsQHJlZGhhdC5jb20+ClJldmlld2VkLWJ5OiBFZHVhcmRv IEhhYmtvc3QgPGVoYWJrb3N0QHJlZGhhdC5jb20+ClNpZ25lZC1vZmYtYnk6IFlvbmkgQmV0dGFu IDx5YmV0dGFuQHJlZGhhdC5jb20+ClJldmlld2VkLWJ5OiBNaWNoYWVsIFMuIFRzaXJraW4gPG1z dEByZWRoYXQuY29tPgpTaWduZWQtb2ZmLWJ5OiBNaWNoYWVsIFMuIFRzaXJraW4gPG1zdEByZWRo YXQuY29tPgotLS0KIGRvY3MvcGNpZV9wY2lfYnJpZGdlLnR4dCAgICAgICAgICAgfCAyICstCiBp bmNsdWRlL2h3L3BjaS9wY2kuaCAgICAgICAgICAgICAgIHwgMyAtLS0KIGh3L2Jsb2NrL252bWUu YyAgICAgICAgICAgICAgICAgICAgfCAxIC0KIGh3L25ldC9lMTAwMGUuYyAgICAgICAgICAgICAg ICAgICAgfCAxIC0KIGh3L3BjaS1icmlkZ2UvcGNpZV9wY2lfYnJpZGdlLmMgICAgfCAxIC0KIGh3 L3BjaS1icmlkZ2UvcGNpZV9yb290X3BvcnQuYyAgICAgfCAxIC0KIGh3L3BjaS1icmlkZ2UveGlv MzEzMF9kb3duc3RyZWFtLmMgfCAxIC0KIGh3L3BjaS1icmlkZ2UveGlvMzEzMF91cHN0cmVhbS5j ICAgfCAxIC0KIGh3L3BjaS1ob3N0L3hpbGlueC1wY2llLmMgICAgICAgICAgfCAxIC0KIGh3L3Bj aS9wY2kuYyAgICAgICAgICAgICAgICAgICAgICAgfCA4ICsrKysrKy0tCiBody9zY3NpL21lZ2Fz YXMuYyAgICAgICAgICAgICAgICAgIHwgNCAtLS0tCiBody91c2IvaGNkLXhoY2kuYyAgICAgICAg ICAgICAgICAgIHwgOSArKysrKysrKy0KIGh3L3ZmaW8vcGNpLmMgICAgICAgICAgICAgICAgICAg ICAgfCA1ICsrKystCiBody94ZW4veGVuX3B0LmMgICAgICAgICAgICAgICAgICAgIHwgOSArKysr KysrKy0KIDE0IGZpbGVzIGNoYW5nZWQsIDI3IGluc2VydGlvbnMoKyksIDIwIGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RvY3MvcGNpZV9wY2lfYnJpZGdlLnR4dCBiL2RvY3MvcGNpZV9wY2lf YnJpZGdlLnR4dAppbmRleCA1YTQyMDNmLi5hYjM1ZWJmIDEwMDY0NAotLS0gYS9kb2NzL3BjaWVf cGNpX2JyaWRnZS50eHQKKysrIGIvZG9jcy9wY2llX3BjaV9icmlkZ2UudHh0CkBAIC0xMTAsNSAr MTEwLDUgQEAgVG8gZW5hYmxlIGRldmljZSBob3QtcGx1ZyBpbnRvIHRoZSBicmlkZ2Ugb24gTGlu dXggdGhlcmUncmUgMyB3YXlzOgogSW1wbGVtZW50YXRpb24KID09PT09PT09PT09PT09CiBUaGUg UENJRS1QQ0kgYnJpZGdlIGlzIGJhc2VkIG9uIFBDSS1QQ0kgYnJpZGdlLCBidXQgYWxzbyBhY2N1 bXVsYXRlcyBQQ0kgRXhwcmVzcwotZmVhdHVyZXMgYXMgYSBQQ0kgRXhwcmVzcyBkZXZpY2UgKGlz X2V4cHJlc3M9MSkuCitmZWF0dXJlcyBhcyBhIFBDSSBFeHByZXNzIGRldmljZS4KIApkaWZmIC0t Z2l0IGEvaW5jbHVkZS9ody9wY2kvcGNpLmggYi9pbmNsdWRlL2h3L3BjaS9wY2kuaAppbmRleCAx NWNlZDk2Li5kOGMxOGM3IDEwMDY0NAotLS0gYS9pbmNsdWRlL2h3L3BjaS9wY2kuaAorKysgYi9p bmNsdWRlL2h3L3BjaS9wY2kuaApAQCAtMjM2LDkgKzIzNiw2IEBAIHR5cGVkZWYgc3RydWN0IFBD SURldmljZUNsYXNzIHsKICAgICAgKi8KICAgICBpbnQgaXNfYnJpZGdlOwogCi0gICAgLyogcGNp ZSBzdHVmZiAqLwotICAgIGludCBpc19leHByZXNzOyAgIC8qIGlzIHRoaXMgZGV2aWNlIHBjaSBl eHByZXNzPyAqLwotCiAgICAgLyogcm9tIGJhciAqLwogICAgIGNvbnN0IGNoYXIgKnJvbWZpbGU7 CiB9IFBDSURldmljZUNsYXNzOwpkaWZmIC0tZ2l0IGEvaHcvYmxvY2svbnZtZS5jIGIvaHcvYmxv Y2svbnZtZS5jCmluZGV4IDUxYTU4ZmUuLjg1ZDI0MDYgMTAwNjQ0Ci0tLSBhL2h3L2Jsb2NrL252 bWUuYworKysgYi9ody9ibG9jay9udm1lLmMKQEAgLTEzNjAsNyArMTM2MCw2IEBAIHN0YXRpYyB2 b2lkIG52bWVfY2xhc3NfaW5pdChPYmplY3RDbGFzcyAqb2MsIHZvaWQgKmRhdGEpCiAgICAgcGMt PnZlbmRvcl9pZCA9IFBDSV9WRU5ET1JfSURfSU5URUw7CiAgICAgcGMtPmRldmljZV9pZCA9IDB4 NTg0NTsKICAgICBwYy0+cmV2aXNpb24gPSAyOwotICAgIHBjLT5pc19leHByZXNzID0gMTsKIAog ICAgIHNldF9iaXQoREVWSUNFX0NBVEVHT1JZX1NUT1JBR0UsIGRjLT5jYXRlZ29yaWVzKTsKICAg ICBkYy0+ZGVzYyA9ICJOb24tVm9sYXRpbGUgTWVtb3J5IEV4cHJlc3MiOwpkaWZmIC0tZ2l0IGEv aHcvbmV0L2UxMDAwZS5jIGIvaHcvbmV0L2UxMDAwZS5jCmluZGV4IDE5MTM5OGEuLjE2YTk0MTcg MTAwNjQ0Ci0tLSBhL2h3L25ldC9lMTAwMGUuYworKysgYi9ody9uZXQvZTEwMDBlLmMKQEAgLTY3 NSw3ICs2NzUsNiBAQCBzdGF0aWMgdm9pZCBlMTAwMGVfY2xhc3NfaW5pdChPYmplY3RDbGFzcyAq Y2xhc3MsIHZvaWQgKmRhdGEpCiAgICAgYy0+cmV2aXNpb24gPSAwOwogICAgIGMtPnJvbWZpbGUg PSAiZWZpLWUxMDAwZS5yb20iOwogICAgIGMtPmNsYXNzX2lkID0gUENJX0NMQVNTX05FVFdPUktf RVRIRVJORVQ7Ci0gICAgYy0+aXNfZXhwcmVzcyA9IDE7CiAKICAgICBkYy0+ZGVzYyA9ICJJbnRl bCA4MjU3NEwgR2JFIENvbnRyb2xsZXIiOwogICAgIGRjLT5yZXNldCA9IGUxMDAwZV9xZGV2X3Jl c2V0OwpkaWZmIC0tZ2l0IGEvaHcvcGNpLWJyaWRnZS9wY2llX3BjaV9icmlkZ2UuYyBiL2h3L3Bj aS1icmlkZ2UvcGNpZV9wY2lfYnJpZGdlLmMKaW5kZXggZTVhYzc5Ny4uMDRjZjVhNiAxMDA2NDQK LS0tIGEvaHcvcGNpLWJyaWRnZS9wY2llX3BjaV9icmlkZ2UuYworKysgYi9ody9wY2ktYnJpZGdl L3BjaWVfcGNpX2JyaWRnZS5jCkBAIC0xNzAsNyArMTcwLDYgQEAgc3RhdGljIHZvaWQgcGNpZV9w Y2lfYnJpZGdlX2NsYXNzX2luaXQoT2JqZWN0Q2xhc3MgKmtsYXNzLCB2b2lkICpkYXRhKQogICAg IERldmljZUNsYXNzICpkYyA9IERFVklDRV9DTEFTUyhrbGFzcyk7CiAgICAgSG90cGx1Z0hhbmRs ZXJDbGFzcyAqaGMgPSBIT1RQTFVHX0hBTkRMRVJfQ0xBU1Moa2xhc3MpOwogCi0gICAgay0+aXNf ZXhwcmVzcyA9IDE7CiAgICAgay0+aXNfYnJpZGdlID0gMTsKICAgICBrLT52ZW5kb3JfaWQgPSBQ Q0lfVkVORE9SX0lEX1JFREhBVDsKICAgICBrLT5kZXZpY2VfaWQgPSBQQ0lfREVWSUNFX0lEX1JF REhBVF9QQ0lFX0JSSURHRTsKZGlmZiAtLWdpdCBhL2h3L3BjaS1icmlkZ2UvcGNpZV9yb290X3Bv cnQuYyBiL2h3L3BjaS1icmlkZ2UvcGNpZV9yb290X3BvcnQuYwppbmRleCA5YjZlNGNlLi40NWY5 ZThjIDEwMDY0NAotLS0gYS9ody9wY2ktYnJpZGdlL3BjaWVfcm9vdF9wb3J0LmMKKysrIGIvaHcv cGNpLWJyaWRnZS9wY2llX3Jvb3RfcG9ydC5jCkBAIC0xNDUsNyArMTQ1LDYgQEAgc3RhdGljIHZv aWQgcnBfY2xhc3NfaW5pdChPYmplY3RDbGFzcyAqa2xhc3MsIHZvaWQgKmRhdGEpCiAgICAgRGV2 aWNlQ2xhc3MgKmRjID0gREVWSUNFX0NMQVNTKGtsYXNzKTsKICAgICBQQ0lEZXZpY2VDbGFzcyAq ayA9IFBDSV9ERVZJQ0VfQ0xBU1Moa2xhc3MpOwogCi0gICAgay0+aXNfZXhwcmVzcyA9IDE7CiAg ICAgay0+aXNfYnJpZGdlID0gMTsKICAgICBrLT5jb25maWdfd3JpdGUgPSBycF93cml0ZV9jb25m aWc7CiAgICAgay0+cmVhbGl6ZSA9IHJwX3JlYWxpemU7CmRpZmYgLS1naXQgYS9ody9wY2ktYnJp ZGdlL3hpbzMxMzBfZG93bnN0cmVhbS5jIGIvaHcvcGNpLWJyaWRnZS94aW8zMTMwX2Rvd25zdHJl YW0uYwppbmRleCA0ZGQyZTY1Li5iMjAyNjU3IDEwMDY0NAotLS0gYS9ody9wY2ktYnJpZGdlL3hp bzMxMzBfZG93bnN0cmVhbS5jCisrKyBiL2h3L3BjaS1icmlkZ2UveGlvMzEzMF9kb3duc3RyZWFt LmMKQEAgLTE3OCw3ICsxNzgsNiBAQCBzdGF0aWMgdm9pZCB4aW8zMTMwX2Rvd25zdHJlYW1fY2xh c3NfaW5pdChPYmplY3RDbGFzcyAqa2xhc3MsIHZvaWQgKmRhdGEpCiAgICAgRGV2aWNlQ2xhc3Mg KmRjID0gREVWSUNFX0NMQVNTKGtsYXNzKTsKICAgICBQQ0lEZXZpY2VDbGFzcyAqayA9IFBDSV9E RVZJQ0VfQ0xBU1Moa2xhc3MpOwogCi0gICAgay0+aXNfZXhwcmVzcyA9IDE7CiAgICAgay0+aXNf YnJpZGdlID0gMTsKICAgICBrLT5jb25maWdfd3JpdGUgPSB4aW8zMTMwX2Rvd25zdHJlYW1fd3Jp dGVfY29uZmlnOwogICAgIGstPnJlYWxpemUgPSB4aW8zMTMwX2Rvd25zdHJlYW1fcmVhbGl6ZTsK ZGlmZiAtLWdpdCBhL2h3L3BjaS1icmlkZ2UveGlvMzEzMF91cHN0cmVhbS5jIGIvaHcvcGNpLWJy aWRnZS94aW8zMTMwX3Vwc3RyZWFtLmMKaW5kZXggYzVmMDJhNi4uNTU2ZjQ3MSAxMDA2NDQKLS0t IGEvaHcvcGNpLWJyaWRnZS94aW8zMTMwX3Vwc3RyZWFtLmMKKysrIGIvaHcvcGNpLWJyaWRnZS94 aW8zMTMwX3Vwc3RyZWFtLmMKQEAgLTE0OSw3ICsxNDksNiBAQCBzdGF0aWMgdm9pZCB4aW8zMTMw X3Vwc3RyZWFtX2NsYXNzX2luaXQoT2JqZWN0Q2xhc3MgKmtsYXNzLCB2b2lkICpkYXRhKQogICAg IERldmljZUNsYXNzICpkYyA9IERFVklDRV9DTEFTUyhrbGFzcyk7CiAgICAgUENJRGV2aWNlQ2xh c3MgKmsgPSBQQ0lfREVWSUNFX0NMQVNTKGtsYXNzKTsKIAotICAgIGstPmlzX2V4cHJlc3MgPSAx OwogICAgIGstPmlzX2JyaWRnZSA9IDE7CiAgICAgay0+Y29uZmlnX3dyaXRlID0geGlvMzEzMF91 cHN0cmVhbV93cml0ZV9jb25maWc7CiAgICAgay0+cmVhbGl6ZSA9IHhpbzMxMzBfdXBzdHJlYW1f cmVhbGl6ZTsKZGlmZiAtLWdpdCBhL2h3L3BjaS1ob3N0L3hpbGlueC1wY2llLmMgYi9ody9wY2kt aG9zdC94aWxpbngtcGNpZS5jCmluZGV4IDUzYjU2MWYuLjA0NGUzMTIgMTAwNjQ0Ci0tLSBhL2h3 L3BjaS1ob3N0L3hpbGlueC1wY2llLmMKKysrIGIvaHcvcGNpLWhvc3QveGlsaW54LXBjaWUuYwpA QCAtMjk3LDcgKzI5Nyw2IEBAIHN0YXRpYyB2b2lkIHhpbGlueF9wY2llX3Jvb3RfY2xhc3NfaW5p dChPYmplY3RDbGFzcyAqa2xhc3MsIHZvaWQgKmRhdGEpCiAgICAgay0+ZGV2aWNlX2lkID0gMHg3 MDIxOwogICAgIGstPnJldmlzaW9uID0gMDsKICAgICBrLT5jbGFzc19pZCA9IFBDSV9DTEFTU19C UklER0VfSE9TVDsKLSAgICBrLT5pc19leHByZXNzID0gdHJ1ZTsKICAgICBrLT5pc19icmlkZ2Ug PSB0cnVlOwogICAgIGstPnJlYWxpemUgPSB4aWxpbnhfcGNpZV9yb290X3JlYWxpemU7CiAgICAg ay0+ZXhpdCA9IHBjaV9icmlkZ2VfZXhpdGZuOwpkaWZmIC0tZ2l0IGEvaHcvcGNpL3BjaS5jIGIv aHcvcGNpL3BjaS5jCmluZGV4IGZjMjVjZGUuLmVmNDM0MjIgMTAwNjQ0Ci0tLSBhL2h3L3BjaS9w Y2kuYworKysgYi9ody9wY2kvcGNpLmMKQEAgLTIwMDUsMTEgKzIwMDUsMTUgQEAgc3RhdGljIHZv aWQgcGNpX3FkZXZfcmVhbGl6ZShEZXZpY2VTdGF0ZSAqcWRldiwgRXJyb3IgKiplcnJwKQogewog ICAgIFBDSURldmljZSAqcGNpX2RldiA9IChQQ0lEZXZpY2UgKilxZGV2OwogICAgIFBDSURldmlj ZUNsYXNzICpwYyA9IFBDSV9ERVZJQ0VfR0VUX0NMQVNTKHBjaV9kZXYpOworICAgIE9iamVjdENs YXNzICprbGFzcyA9IE9CSkVDVF9DTEFTUyhwYyk7CiAgICAgRXJyb3IgKmxvY2FsX2VyciA9IE5V TEw7CiAgICAgYm9vbCBpc19kZWZhdWx0X3JvbTsKIAotICAgIC8qIGluaXRpYWxpemUgY2FwX3By ZXNlbnQgZm9yIHBjaV9pc19leHByZXNzKCkgYW5kIHBjaV9jb25maWdfc2l6ZSgpICovCi0gICAg aWYgKHBjLT5pc19leHByZXNzKSB7CisgICAgLyogaW5pdGlhbGl6ZSBjYXBfcHJlc2VudCBmb3Ig cGNpX2lzX2V4cHJlc3MoKSBhbmQgcGNpX2NvbmZpZ19zaXplKCksCisgICAgICogTm90ZSB0aGF0 IGh5YnJpZCBQQ0lzIGFyZSBub3Qgc2V0IGF1dG9tYXRpY2FsbHkgYW5kIG5lZWQgdG8gbWFuYWdl CisgICAgICogUUVNVV9QQ0lfQ0FQX0VYUFJFU1MgbWFudWFsbHkgKi8KKyAgICBpZiAob2JqZWN0 X2NsYXNzX2R5bmFtaWNfY2FzdChrbGFzcywgSU5URVJGQUNFX1BDSUVfREVWSUNFKSAmJgorICAg ICAgICFvYmplY3RfY2xhc3NfZHluYW1pY19jYXN0KGtsYXNzLCBJTlRFUkZBQ0VfQ09OVkVOVElP TkFMX1BDSV9ERVZJQ0UpKSB7CiAgICAgICAgIHBjaV9kZXYtPmNhcF9wcmVzZW50IHw9IFFFTVVf UENJX0NBUF9FWFBSRVNTOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvaHcvc2NzaS9tZWdhc2FzLmMg Yi9ody9zY3NpL21lZ2FzYXMuYwppbmRleCAzZTM4ZTllLi5iYTFhZmEzIDEwMDY0NAotLS0gYS9o dy9zY3NpL21lZ2FzYXMuYworKysgYi9ody9zY3NpL21lZ2FzYXMuYwpAQCAtMjQ0Nyw3ICsyNDQ3 LDYgQEAgdHlwZWRlZiBzdHJ1Y3QgTWVnYXNhc0luZm8gewogICAgIHVpbnQxNl90IHN1YnN5c3Rl bV9pZDsKICAgICBpbnQgaW9wb3J0X2JhcjsKICAgICBpbnQgbW1pb19iYXI7Ci0gICAgYm9vbCBp c19leHByZXNzOwogICAgIGludCBvc3RzOwogICAgIGNvbnN0IFZNU3RhdGVEZXNjcmlwdGlvbiAq dm1zZDsKICAgICBQcm9wZXJ0eSAqcHJvcHM7CkBAIC0yNDY1LDcgKzI0NjQsNiBAQCBzdGF0aWMg c3RydWN0IE1lZ2FzYXNJbmZvIG1lZ2FzYXNfZGV2aWNlc1tdID0gewogICAgICAgICAuaW9wb3J0 X2JhciA9IDIsCiAgICAgICAgIC5tbWlvX2JhciA9IDAsCiAgICAgICAgIC5vc3RzID0gTUZJXzEw NzhfUk0gfCAxLAotICAgICAgICAuaXNfZXhwcmVzcyA9IGZhbHNlLAogICAgICAgICAudm1zZCA9 ICZ2bXN0YXRlX21lZ2FzYXNfZ2VuMSwKICAgICAgICAgLnByb3BzID0gbWVnYXNhc19wcm9wZXJ0 aWVzX2dlbjEsCiAgICAgICAgIC5pbnRlcmZhY2VzID0gKEludGVyZmFjZUluZm9bXSkgewpAQCAt MjQ4Miw3ICsyNDgwLDYgQEAgc3RhdGljIHN0cnVjdCBNZWdhc2FzSW5mbyBtZWdhc2FzX2Rldmlj ZXNbXSA9IHsKICAgICAgICAgLmlvcG9ydF9iYXIgPSAwLAogICAgICAgICAubW1pb19iYXIgPSAx LAogICAgICAgICAub3N0cyA9IE1GSV9HRU4yX1JNLAotICAgICAgICAuaXNfZXhwcmVzcyA9IHRy dWUsCiAgICAgICAgIC52bXNkID0gJnZtc3RhdGVfbWVnYXNhc19nZW4yLAogICAgICAgICAucHJv cHMgPSBtZWdhc2FzX3Byb3BlcnRpZXNfZ2VuMiwKICAgICAgICAgLmludGVyZmFjZXMgPSAoSW50 ZXJmYWNlSW5mb1tdKSB7CkBAIC0yNTA2LDcgKzI1MDMsNiBAQCBzdGF0aWMgdm9pZCBtZWdhc2Fz X2NsYXNzX2luaXQoT2JqZWN0Q2xhc3MgKm9jLCB2b2lkICpkYXRhKQogICAgIHBjLT5zdWJzeXN0 ZW1fdmVuZG9yX2lkID0gUENJX1ZFTkRPUl9JRF9MU0lfTE9HSUM7CiAgICAgcGMtPnN1YnN5c3Rl bV9pZCA9IGluZm8tPnN1YnN5c3RlbV9pZDsKICAgICBwYy0+Y2xhc3NfaWQgPSBQQ0lfQ0xBU1Nf U1RPUkFHRV9SQUlEOwotICAgIHBjLT5pc19leHByZXNzID0gaW5mby0+aXNfZXhwcmVzczsKICAg ICBlLT5tbWlvX2JhciA9IGluZm8tPm1taW9fYmFyOwogICAgIGUtPmlvcG9ydF9iYXIgPSBpbmZv LT5pb3BvcnRfYmFyOwogICAgIGUtPm9zdHMgPSBpbmZvLT5vc3RzOwpkaWZmIC0tZ2l0IGEvaHcv dXNiL2hjZC14aGNpLmMgYi9ody91c2IvaGNkLXhoY2kuYwppbmRleCAyMjhlODJiLi43MjFiZWI1 IDEwMDY0NAotLS0gYS9ody91c2IvaGNkLXhoY2kuYworKysgYi9ody91c2IvaGNkLXhoY2kuYwpA QCAtMzY0OSw2ICszNjQ5LDEzIEBAIHN0YXRpYyBQcm9wZXJ0eSB4aGNpX3Byb3BlcnRpZXNbXSA9 IHsKICAgICBERUZJTkVfUFJPUF9FTkRfT0ZfTElTVCgpLAogfTsKIAorc3RhdGljIHZvaWQgeGhj aV9pbnN0YW5jZV9pbml0KE9iamVjdCAqb2JqKQoreworICAgIC8qIFFFTVVfUENJX0NBUF9FWFBS RVNTIGluaXRpYWxpemF0aW9uIGRvZXMgbm90IGRlcGVuZCBvbiBRRU1VIGNvbW1hbmQKKyAgICAg KiBsaW5lLCB0aGVyZWZvcmUsIG5vIG5lZWQgdG8gd2FpdCB0byByZWFsaXplIGxpa2Ugb3RoZXIg ZGV2aWNlcyAqLworICAgIFBDSV9ERVZJQ0Uob2JqKS0+Y2FwX3ByZXNlbnQgfD0gUUVNVV9QQ0lf Q0FQX0VYUFJFU1M7Cit9CisKIHN0YXRpYyB2b2lkIHhoY2lfY2xhc3NfaW5pdChPYmplY3RDbGFz cyAqa2xhc3MsIHZvaWQgKmRhdGEpCiB7CiAgICAgUENJRGV2aWNlQ2xhc3MgKmsgPSBQQ0lfREVW SUNFX0NMQVNTKGtsYXNzKTsKQEAgLTM2NjEsNyArMzY2OCw2IEBAIHN0YXRpYyB2b2lkIHhoY2lf Y2xhc3NfaW5pdChPYmplY3RDbGFzcyAqa2xhc3MsIHZvaWQgKmRhdGEpCiAgICAgay0+cmVhbGl6 ZSAgICAgID0gdXNiX3hoY2lfcmVhbGl6ZTsKICAgICBrLT5leGl0ICAgICAgICAgPSB1c2JfeGhj aV9leGl0OwogICAgIGstPmNsYXNzX2lkICAgICA9IFBDSV9DTEFTU19TRVJJQUxfVVNCOwotICAg IGstPmlzX2V4cHJlc3MgICA9IDE7CiB9CiAKIHN0YXRpYyBjb25zdCBUeXBlSW5mbyB4aGNpX2lu Zm8gPSB7CkBAIC0zNjY5LDYgKzM2NzUsNyBAQCBzdGF0aWMgY29uc3QgVHlwZUluZm8geGhjaV9p bmZvID0gewogICAgIC5wYXJlbnQgICAgICAgID0gVFlQRV9QQ0lfREVWSUNFLAogICAgIC5pbnN0 YW5jZV9zaXplID0gc2l6ZW9mKFhIQ0lTdGF0ZSksCiAgICAgLmNsYXNzX2luaXQgICAgPSB4aGNp X2NsYXNzX2luaXQsCisgICAgLmluc3RhbmNlX2luaXQgPSB4aGNpX2luc3RhbmNlX2luaXQsCiAg ICAgLmFic3RyYWN0ICAgICAgPSB0cnVlLAogICAgIC5pbnRlcmZhY2VzID0gKEludGVyZmFjZUlu Zm9bXSkgewogICAgICAgICB7IElOVEVSRkFDRV9QQ0lFX0RFVklDRSB9LApkaWZmIC0tZ2l0IGEv aHcvdmZpby9wY2kuYyBiL2h3L3ZmaW8vcGNpLmMKaW5kZXggODc5NTEwYy4uYjMzYzVlOCAxMDA2 NDQKLS0tIGEvaHcvdmZpby9wY2kuYworKysgYi9ody92ZmlvL3BjaS5jCkBAIC0zMTEzLDYgKzMx MTMsMTAgQEAgc3RhdGljIHZvaWQgdmZpb19pbnN0YW5jZV9pbml0KE9iamVjdCAqb2JqKQogICAg IHZkZXYtPmhvc3QuZnVuY3Rpb24gPSB+MFU7CiAKICAgICB2ZGV2LT5udl9ncHVkaXJlY3RfY2xp cXVlID0gMHhGRjsKKworICAgIC8qIFFFTVVfUENJX0NBUF9FWFBSRVNTIGluaXRpYWxpemF0aW9u IGRvZXMgbm90IGRlcGVuZCBvbiBRRU1VIGNvbW1hbmQKKyAgICAgKiBsaW5lLCB0aGVyZWZvcmUs IG5vIG5lZWQgdG8gd2FpdCB0byByZWFsaXplIGxpa2Ugb3RoZXIgZGV2aWNlcyAqLworICAgIHBj aV9kZXYtPmNhcF9wcmVzZW50IHw9IFFFTVVfUENJX0NBUF9FWFBSRVNTOwogfQogCiBzdGF0aWMg UHJvcGVydHkgdmZpb19wY2lfZGV2X3Byb3BlcnRpZXNbXSA9IHsKQEAgLTMxNzEsNyArMzE3NSw2 IEBAIHN0YXRpYyB2b2lkIHZmaW9fcGNpX2Rldl9jbGFzc19pbml0KE9iamVjdENsYXNzICprbGFz cywgdm9pZCAqZGF0YSkKICAgICBwZGMtPmV4aXQgPSB2ZmlvX2V4aXRmbjsKICAgICBwZGMtPmNv bmZpZ19yZWFkID0gdmZpb19wY2lfcmVhZF9jb25maWc7CiAgICAgcGRjLT5jb25maWdfd3JpdGUg PSB2ZmlvX3BjaV93cml0ZV9jb25maWc7Ci0gICAgcGRjLT5pc19leHByZXNzID0gMTsgLyogV2Ug bWlnaHQgYmUgKi8KIH0KIAogc3RhdGljIGNvbnN0IFR5cGVJbmZvIHZmaW9fcGNpX2Rldl9pbmZv ID0gewpkaWZmIC0tZ2l0IGEvaHcveGVuL3hlbl9wdC5jIGIvaHcveGVuL3hlbl9wdC5jCmluZGV4 IGY2NjJmMzAuLjliN2E5NjAgMTAwNjQ0Ci0tLSBhL2h3L3hlbi94ZW5fcHQuYworKysgYi9ody94 ZW4veGVuX3B0LmMKQEAgLTkzNyw2ICs5MzcsMTMgQEAgc3RhdGljIFByb3BlcnR5IHhlbl9wY2lf cGFzc3Rocm91Z2hfcHJvcGVydGllc1tdID0gewogICAgIERFRklORV9QUk9QX0VORF9PRl9MSVNU KCksCiB9OwogCitzdGF0aWMgdm9pZCB4ZW5fcGNpX3Bhc3N0aHJvdWdoX2luc3RhbmNlX2luaXQo T2JqZWN0ICpvYmopCit7CisgICAgLyogUUVNVV9QQ0lfQ0FQX0VYUFJFU1MgaW5pdGlhbGl6YXRp b24gZG9lcyBub3QgZGVwZW5kIG9uIFFFTVUgY29tbWFuZAorICAgICAqIGxpbmUsIHRoZXJlZm9y ZSwgbm8gbmVlZCB0byB3YWl0IHRvIHJlYWxpemUgbGlrZSBvdGhlciBkZXZpY2VzICovCisgICAg UENJX0RFVklDRShvYmopLT5jYXBfcHJlc2VudCB8PSBRRU1VX1BDSV9DQVBfRVhQUkVTUzsKK30K Kwogc3RhdGljIHZvaWQgeGVuX3BjaV9wYXNzdGhyb3VnaF9jbGFzc19pbml0KE9iamVjdENsYXNz ICprbGFzcywgdm9pZCAqZGF0YSkKIHsKICAgICBEZXZpY2VDbGFzcyAqZGMgPSBERVZJQ0VfQ0xB U1Moa2xhc3MpOwpAQCAtOTQ2LDcgKzk1Myw2IEBAIHN0YXRpYyB2b2lkIHhlbl9wY2lfcGFzc3Ro cm91Z2hfY2xhc3NfaW5pdChPYmplY3RDbGFzcyAqa2xhc3MsIHZvaWQgKmRhdGEpCiAgICAgay0+ ZXhpdCA9IHhlbl9wdF91bnJlZ2lzdGVyX2RldmljZTsKICAgICBrLT5jb25maWdfcmVhZCA9IHhl bl9wdF9wY2lfcmVhZF9jb25maWc7CiAgICAgay0+Y29uZmlnX3dyaXRlID0geGVuX3B0X3BjaV93 cml0ZV9jb25maWc7Ci0gICAgay0+aXNfZXhwcmVzcyA9IDE7IC8qIFdlIG1pZ2h0IGJlICovCiAg ICAgc2V0X2JpdChERVZJQ0VfQ0FURUdPUllfTUlTQywgZGMtPmNhdGVnb3JpZXMpOwogICAgIGRj LT5kZXNjID0gIkFzc2lnbiBhbiBob3N0IFBDSSBkZXZpY2Ugd2l0aCBYZW4iOwogICAgIGRjLT5w cm9wcyA9IHhlbl9wY2lfcGFzc3Rocm91Z2hfcHJvcGVydGllczsKQEAgLTk2NSw2ICs5NzEsNyBA QCBzdGF0aWMgY29uc3QgVHlwZUluZm8geGVuX3BjaV9wYXNzdGhyb3VnaF9pbmZvID0gewogICAg IC5pbnN0YW5jZV9zaXplID0gc2l6ZW9mKFhlblBDSVBhc3N0aHJvdWdoU3RhdGUpLAogICAgIC5p bnN0YW5jZV9maW5hbGl6ZSA9IHhlbl9wY2lfcGFzc3Rocm91Z2hfZmluYWxpemUsCiAgICAgLmNs YXNzX2luaXQgPSB4ZW5fcGNpX3Bhc3N0aHJvdWdoX2NsYXNzX2luaXQsCisgICAgLmluc3RhbmNl X2luaXQgPSB4ZW5fcGNpX3Bhc3N0aHJvdWdoX2luc3RhbmNlX2luaXQsCiAgICAgLmludGVyZmFj ZXMgPSAoSW50ZXJmYWNlSW5mb1tdKSB7CiAgICAgICAgIHsgSU5URVJGQUNFX0NPTlZFTlRJT05B TF9QQ0lfREVWSUNFIH0sCiAgICAgICAgIHsgSU5URVJGQUNFX1BDSUVfREVWSUNFIH0sCi0tIApN U1QKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4t ZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczov L2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs