Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0059AC2D0D0 for ; Tue, 24 Dec 2019 15:20:27 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BF083206D3 for ; Tue, 24 Dec 2019 15:20:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="VH/0fAx8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BF083206D3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ijlye-0000ke-Pw; Tue, 24 Dec 2019 15:20:04 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1ijlyd-0000aM-3b for xen-devel@lists.xenproject.org; Tue, 24 Dec 2019 15:20:03 +0000 X-Inumbo-ID: cdd8b883-2660-11ea-97e5-12813bfff9fa Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id cdd8b883-2660-11ea-97e5-12813bfff9fa; Tue, 24 Dec 2019 15:19:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1577200781; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=oG02qkIoQf6BR/eNaATw59qDvYQbyCXkFXPiQUiHJmg=; b=VH/0fAx8R+nFjJLUkE7DDYH0ijq0ca5l8nDGeguyVs6CReIG96mYr8DN 6r50sEYgEZElklyKCx70cCWZHsTmtcXGkpYOi7763nGdRh7g70EfL6iXx SpPbL7+tlEgzZWOk1MO39mRUhVnlYCx7eQdaxt6WEEdf4cTjqR5yUTq58 Q=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=andrew.cooper3@citrix.com; spf=Pass smtp.mailfrom=Andrew.Cooper3@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa5.hc3370-68.iphmx.com: no sender authenticity information available from domain of andrew.cooper3@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa5.hc3370-68.iphmx.com: domain of Andrew.Cooper3@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="Andrew.Cooper3@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa5.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: 2IqP6V0Fnq+PyVan2TfVu9aD+p+5KyULCuk/9mzMfAo53fPpIIfVvAd3f8F/13fgDvjVp7HxqH dDmDZANrWV0nD55MB8RZ3TH60+QO+k/7FkaOLqlAHuWqJTPpSNnHbHgo03PczcX61pHV37N+x/ 5rgsDe5hDLd/buu9k6/3yu0+IBscAUoDg3pM5XDNfue1+HZrh2fehr/VebGatHiLuzkhFyQLFs /WA7qiBj/hhT1suQSqp5hrnVxriaaMbsvQa95VHV8I4vAy/pkigrKvwHJh6/1aZAmY13foXVg+ LoY= X-SBRS: 2.7 X-MesageID: 10482753 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.69,351,1571716800"; d="scan'208";a="10482753" From: Andrew Cooper To: Xen-devel Date: Tue, 24 Dec 2019 15:19:28 +0000 Message-ID: <20191224151932.6304-9-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191224151932.6304-1-andrew.cooper3@citrix.com> References: <20191224151932.6304-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH 08/12] libxc/restore: Support v3 streams, and cope with v2 compatibilty X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , Wei Liu , Ian Jackson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" SW50cm9kdWNlIGEgc3RhdGljX2RhdGFfY29tcGxldGUoKSBob29rIHdoaWNoIGlzIGNhbGxlZCB3 aGVuIGEKU1RBVElDX0RBVEFfRU5EIHJlY29yZCBpcyBmb3VuZCAodjMpIG9yIGluZmVycmVkICh2 MikuCgpNb2RpZnkgaGFuZGxlX3BhZ2VfZGF0YSgpIGFuZCBoYW5kbGVfeDg2X3B2X3AybV9mcmFt ZXMoKSB0byBpbmZlciB0aGUKcG9zaXRpb24gaW4gdjIgc3RyZWFtcy4KClRoZSBpbXBsZW1lbnRh dGlvbiBvZiB4ODZfc3RhdGljX2RhdGFfY29tcGxldGUoKSBuZWVkcyB0byB3YWl0IHVudGlsCm1v cmUgcGx1bWJpbmcgaXMgaW4gcGxhY2UsIHRvIG1ha2UgYSBjb21iaW5lZCBsaWJ4bC9saWJ4YyBj aGFuZ2UgdG8KbWFpbnRhaW4gKGZ1bmN0aW9uYWwpIGJpc2VjdGFiaWxpdHkuCgpObyBwcmFjdGlj YWwgY2hhbmdlIHRvIGJlaGF2aW91ciAtIHRoaXMgaXMgYWxsIHBsdW1iaW5nIHdvcmsuCgpTaWdu ZWQtb2ZmLWJ5OiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0BjaXRyaXguY29tPgotLS0K Q0M6IElhbiBKYWNrc29uIDxJYW4uSmFja3NvbkBjaXRyaXguY29tPgpDQzogV2VpIExpdSA8d2xA eGVuLm9yZz4KLS0tCiB0b29scy9saWJ4Yy94Y19zcl9jb21tb24uaCAgICAgICAgICB8IDE5ICsr KysrKysrKysrKysrKwogdG9vbHMvbGlieGMveGNfc3JfY29tbW9uX3g4Ni5jICAgICAgfCAgNyAr KysrKysKIHRvb2xzL2xpYnhjL3hjX3NyX2NvbW1vbl94ODYuaCAgICAgIHwgIDUgKysrKwogdG9v bHMvbGlieGMveGNfc3JfcmVzdG9yZS5jICAgICAgICAgfCA0NyArKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKy0tCiB0b29scy9saWJ4Yy94Y19zcl9yZXN0b3JlX3g4Nl9odm0uYyB8 ICAxICsKIHRvb2xzL2xpYnhjL3hjX3NyX3Jlc3RvcmVfeDg2X3B2LmMgIHwgMTggKysrKysrKysr KysrKysKIDYgZmlsZXMgY2hhbmdlZCwgOTUgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS90b29scy9saWJ4Yy94Y19zcl9jb21tb24uaCBiL3Rvb2xzL2xpYnhjL3hj X3NyX2NvbW1vbi5oCmluZGV4IDAyODljMDFlMTMuLjJlOWE0YmM1ODcgMTAwNjQ0Ci0tLSBhL3Rv b2xzL2xpYnhjL3hjX3NyX2NvbW1vbi5oCisrKyBiL3Rvb2xzL2xpYnhjL3hjX3NyX2NvbW1vbi5o CkBAIC0xNTMsNiArMTUzLDEzIEBAIHN0cnVjdCB4Y19zcl9yZXN0b3JlX29wcwogICAgIGludCAo KnByb2Nlc3NfcmVjb3JkKShzdHJ1Y3QgeGNfc3JfY29udGV4dCAqY3R4LCBzdHJ1Y3QgeGNfc3Jf cmVjb3JkICpyZWMpOwogCiAgICAgLyoqCisgICAgICogUGVyZm9ybSBhbnkgYWN0aW9ucyByZXF1 aXJlZCBhZnRlciB0aGUgc3RhdGljIGRhdGEgaGFzIGFycml2ZWQuICBDYWxsZWQKKyAgICAgKiB3 aGVuIHRoZSBTVEFUSUNfREFUQV9DT01QTEVURSByZWNvcmQgaGFzIGJlZW4gcmVjaWV2ZWQgKG9y IGluZmVycmVkIGluCisgICAgICogdjItY29tcGF0aWJpbGl0eSBtb2RlKS4KKyAgICAgKi8KKyAg ICBpbnQgKCpzdGF0aWNfZGF0YV9jb21wbGV0ZSkoc3RydWN0IHhjX3NyX2NvbnRleHQgKmN0eCk7 CisKKyAgICAvKioKICAgICAgKiBQZXJmb3JtIGFueSBhY3Rpb25zIHJlcXVpcmVkIGFmdGVyIHRo ZSBzdHJlYW0gaGFzIGJlZW4gZmluaXNoZWQuIENhbGxlZAogICAgICAqIGFmdGVyIHRoZSBFTkQg cmVjb3JkIGhhcyBiZWVuIHJlY2VpdmVkLgogICAgICAqLwpAQCAtMjU1LDYgKzI2MiwxMiBAQCBz dHJ1Y3QgeGNfc3JfY29udGV4dAogICAgICAgICAgICAgLyogQ3VycmVudGx5IGJ1ZmZlcmluZyBy ZWNvcmRzIGJldHdlZW4gYSBjaGVja3BvaW50ICovCiAgICAgICAgICAgICBib29sIGJ1ZmZlcl9h bGxfcmVjb3JkczsKIAorICAgICAgICAgICAgLyoKKyAgICAgICAgICAgICAqIFdoZXRoZXIgYSBT VEFUSUNfREFUQV9FTkQgcmVjb3JkIGhhcyBiZWVuIHNlZW4gKG9yIGltcGxpZWQgZm9yCisgICAg ICAgICAgICAgKiB2MiBjb21wYXRpYmlsaXR5KS4KKyAgICAgICAgICAgICAqLworICAgICAgICAg ICAgYm9vbCBzZWVuX3N0YXRpY19kYXRhX2VuZDsKKwogLyoKICAqIFdpdGggUmVtdXMvQ09MTywg d2UgYnVmZmVyIHRoZSByZWNvcmRzIHNlbnQgYnkgdGhlIHByaW1hcnkgYXQgY2hlY2twb2ludCwK ICAqIGluIGNhc2UgdGhlIHByaW1hcnkgd2lsbCBmYWlsLCB3ZSBjYW4gcmVjb3ZlciBmcm9tIHRo ZSBsYXN0CkBAIC00MjcsNiArNDQwLDEyIEBAIGludCByZWFkX3JlY29yZChzdHJ1Y3QgeGNfc3Jf Y29udGV4dCAqY3R4LCBpbnQgZmQsIHN0cnVjdCB4Y19zcl9yZWNvcmQgKnJlYyk7CiBpbnQgcG9w dWxhdGVfcGZucyhzdHJ1Y3QgeGNfc3JfY29udGV4dCAqY3R4LCB1bnNpZ25lZCBpbnQgY291bnQs CiAgICAgICAgICAgICAgICAgICBjb25zdCB4ZW5fcGZuX3QgKm9yaWdpbmFsX3BmbnMsIGNvbnN0 IHVpbnQzMl90ICp0eXBlcyk7CiAKKy8qCisgKiBIYW5kbGUgYSBTVEFUSUNfREFUQV9FTkQgcmVj b3JkLiAgRm9yIGEgdjIgY29tcGF0IHN0cmVhbSwgdGhlIHBvc2l0aW9uIG9mCisgKiB0aGlzIHJl Y29yZCBpcyBpbmZlcnJlZCBmcm9tIG90aGVyIHJlY29yZHMuCisgKi8KK2ludCBoYW5kbGVfc3Rh dGljX2RhdGFfZW5kKHN0cnVjdCB4Y19zcl9jb250ZXh0ICpjdHgpOworCiAjZW5kaWYKIC8qCiAg KiBMb2NhbCB2YXJpYWJsZXM6CmRpZmYgLS1naXQgYS90b29scy9saWJ4Yy94Y19zcl9jb21tb25f eDg2LmMgYi90b29scy9saWJ4Yy94Y19zcl9jb21tb25feDg2LmMKaW5kZXggMDExNjg0ZGY5Ny4u MDgzNDU0ZDI1NiAxMDA2NDQKLS0tIGEvdG9vbHMvbGlieGMveGNfc3JfY29tbW9uX3g4Ni5jCisr KyBiL3Rvb2xzL2xpYnhjL3hjX3NyX2NvbW1vbl94ODYuYwpAQCAtNDIsNiArNDIsMTMgQEAgaW50 IGhhbmRsZV94ODZfdHNjX2luZm8oc3RydWN0IHhjX3NyX2NvbnRleHQgKmN0eCwgc3RydWN0IHhj X3NyX3JlY29yZCAqcmVjKQogICAgIHJldHVybiAwOwogfQogCitpbnQgeDg2X3N0YXRpY19kYXRh X2NvbXBsZXRlKHN0cnVjdCB4Y19zcl9jb250ZXh0ICpjdHgpCit7CisgICAgLyogVE9ETyAtIHNv bWV0aGluZyB1c2VmdWwuICovCisKKyAgICByZXR1cm4gMDsKK30KKwogLyoKICAqIExvY2FsIHZh cmlhYmxlczoKICAqIG1vZGU6IEMKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhjL3hjX3NyX2NvbW1v bl94ODYuaCBiL3Rvb2xzL2xpYnhjL3hjX3NyX2NvbW1vbl94ODYuaAppbmRleCBlYmM0MzU1YmQx Li43YzJkNDJlZmU4IDEwMDY0NAotLS0gYS90b29scy9saWJ4Yy94Y19zcl9jb21tb25feDg2LmgK KysrIGIvdG9vbHMvbGlieGMveGNfc3JfY29tbW9uX3g4Ni5oCkBAIC0xNCw2ICsxNCwxMSBAQCBp bnQgd3JpdGVfeDg2X3RzY19pbmZvKHN0cnVjdCB4Y19zcl9jb250ZXh0ICpjdHgpOwogICovCiBp bnQgaGFuZGxlX3g4Nl90c2NfaW5mbyhzdHJ1Y3QgeGNfc3JfY29udGV4dCAqY3R4LCBzdHJ1Y3Qg eGNfc3JfcmVjb3JkICpyZWMpOwogCisvKgorICogUGVyZm9ybSBjb21tb24geDg2IGFjdGlvbnMg cmVxdWlyZWQgYWZ0ZXIgdGhlIHN0YXRpYyBkYXRhIGhhcyBhcnJpdmVkLgorICovCitpbnQgeDg2 X3N0YXRpY19kYXRhX2NvbXBsZXRlKHN0cnVjdCB4Y19zcl9jb250ZXh0ICpjdHgpOworCiAjZW5k aWYKIC8qCiAgKiBMb2NhbCB2YXJpYWJsZXM6CmRpZmYgLS1naXQgYS90b29scy9saWJ4Yy94Y19z cl9yZXN0b3JlLmMgYi90b29scy9saWJ4Yy94Y19zcl9yZXN0b3JlLmMKaW5kZXggMDI4MGU1NWQ0 Yi4uZDRiZDYwYTMxZSAxMDA2NDQKLS0tIGEvdG9vbHMvbGlieGMveGNfc3JfcmVzdG9yZS5jCisr KyBiL3Rvb2xzL2xpYnhjL3hjX3NyX3Jlc3RvcmUuYwpAQCAtMzUsOSArMzUsOSBAQCBzdGF0aWMg aW50IHJlYWRfaGVhZGVycyhzdHJ1Y3QgeGNfc3JfY29udGV4dCAqY3R4KQogICAgICAgICByZXR1 cm4gLTE7CiAgICAgfQogCi0gICAgaWYgKCBpaGRyLnZlcnNpb24gIT0gMiApCisgICAgaWYgKCBp aGRyLnZlcnNpb24gPCAyIHx8IGloZHIudmVyc2lvbiA+IDMgKQogICAgIHsKLSAgICAgICAgRVJS T1IoIkludmFsaWQgVmVyc2lvbjogRXhwZWN0ZWQgMiwgR290ICVkIiwKKyAgICAgICAgRVJST1Io IkludmFsaWQgVmVyc2lvbjogRXhwZWN0ZWQgMiA8PSB2ZXIgPD0gMywgR290ICVkIiwKICAgICAg ICAgICAgICAgaWhkci52ZXJzaW9uKTsKICAgICAgICAgcmV0dXJuIC0xOwogICAgIH0KQEAgLTM0 Miw2ICszNDIsMzAgQEAgc3RhdGljIGludCBoYW5kbGVfcGFnZV9kYXRhKHN0cnVjdCB4Y19zcl9j b250ZXh0ICpjdHgsIHN0cnVjdCB4Y19zcl9yZWNvcmQgKnJlYykKICAgICB4ZW5fcGZuX3QgKnBm bnMgPSBOVUxMLCBwZm47CiAgICAgdWludDMyX3QgKnR5cGVzID0gTlVMTCwgdHlwZTsKIAorICAg IC8qCisgICAgICogVGhpcyBpcyBhIGJpdCBvZiBhIGJvZGdlLCBidXQgaXQgaXMgbGVzcyBiYWQg dGhhbiBkdXBsaWNhdGluZworICAgICAqIGhhbmRsZV9wYWdlX2RhdGEoKSBiZXR3ZWVuIGRpZmZl cmVudCBhcmNoaXRlY3R1cmVzLgorICAgICAqLworI2lmIGRlZmluZWQoX19pMzg2X18pIHx8IGRl ZmluZWQoX194ODZfNjRfXykKKyAgICAvKiB2MiBjb21wYXQuICBJbmZlciB0aGUgcG9zaXRpb24g b2YgU1RBVElDX0RBVEFfRU5ELiAqLworICAgIGlmICggY3R4LT5yZXN0b3JlLmZvcm1hdF92ZXJz aW9uIDwgMyAmJiAhY3R4LT5yZXN0b3JlLnNlZW5fc3RhdGljX2RhdGFfZW5kICkKKyAgICB7Cisg ICAgICAgIHJjID0gaGFuZGxlX3N0YXRpY19kYXRhX2VuZChjdHgpOworICAgICAgICBpZiAoIHJj ICkKKyAgICAgICAgeworICAgICAgICAgICAgRVJST1IoIkluZmVycmVkIFNUQVRJQ19EQVRBX0VO RCByZWNvcmQgZmFpbGVkIik7CisgICAgICAgICAgICBnb3RvIGVycjsKKyAgICAgICAgfQorICAg ICAgICByYyA9IC0xOworICAgIH0KKworICAgIGlmICggIWN0eC0+cmVzdG9yZS5zZWVuX3N0YXRp Y19kYXRhX2VuZCApCisgICAgeworICAgICAgICBFUlJPUigiTm8gU1RBVElDX0RBVEFfRU5EIHNl ZW4iKTsKKyAgICAgICAgZ290byBlcnI7CisgICAgfQorI2VuZGlmCisKICAgICBpZiAoIHJlYy0+ bGVuZ3RoIDwgc2l6ZW9mKCpwYWdlcykgKQogICAgIHsKICAgICAgICAgRVJST1IoIlBBR0VfREFU QSByZWNvcmQgdHJ1bmNhdGVkOiBsZW5ndGggJXUsIG1pbiAlenUiLApAQCAtNjMxLDYgKzY1NSwy MSBAQCBzdGF0aWMgaW50IGJ1ZmZlcl9yZWNvcmQoc3RydWN0IHhjX3NyX2NvbnRleHQgKmN0eCwg c3RydWN0IHhjX3NyX3JlY29yZCAqcmVjKQogICAgIHJldHVybiAwOwogfQogCitpbnQgaGFuZGxl X3N0YXRpY19kYXRhX2VuZChzdHJ1Y3QgeGNfc3JfY29udGV4dCAqY3R4KQoreworICAgIHhjX2lu dGVyZmFjZSAqeGNoID0gY3R4LT54Y2g7CisKKyAgICBpZiAoIGN0eC0+cmVzdG9yZS5zZWVuX3N0 YXRpY19kYXRhX2VuZCApCisgICAgeworICAgICAgICBFUlJPUigiTXVsdGlwbGUgU1RBVElDX0RB VEFfRU5EIHJlY29yZHMgZm91bmQiKTsKKyAgICAgICAgcmV0dXJuIC0xOworICAgIH0KKworICAg IGN0eC0+cmVzdG9yZS5zZWVuX3N0YXRpY19kYXRhX2VuZCA9IHRydWU7CisKKyAgICByZXR1cm4g Y3R4LT5yZXN0b3JlLm9wcy5zdGF0aWNfZGF0YV9jb21wbGV0ZShjdHgpOworfQorCiBzdGF0aWMg aW50IHByb2Nlc3NfcmVjb3JkKHN0cnVjdCB4Y19zcl9jb250ZXh0ICpjdHgsIHN0cnVjdCB4Y19z cl9yZWNvcmQgKnJlYykKIHsKICAgICB4Y19pbnRlcmZhY2UgKnhjaCA9IGN0eC0+eGNoOwpAQCAt NjU0LDYgKzY5MywxMCBAQCBzdGF0aWMgaW50IHByb2Nlc3NfcmVjb3JkKHN0cnVjdCB4Y19zcl9j b250ZXh0ICpjdHgsIHN0cnVjdCB4Y19zcl9yZWNvcmQgKnJlYykKICAgICAgICAgcmMgPSBoYW5k bGVfY2hlY2twb2ludChjdHgpOwogICAgICAgICBicmVhazsKIAorICAgIGNhc2UgUkVDX1RZUEVf U1RBVElDX0RBVEFfRU5EOgorICAgICAgICByYyA9IGhhbmRsZV9zdGF0aWNfZGF0YV9lbmQoY3R4 KTsKKyAgICAgICAgYnJlYWs7CisKICAgICBkZWZhdWx0OgogICAgICAgICByYyA9IGN0eC0+cmVz dG9yZS5vcHMucHJvY2Vzc19yZWNvcmQoY3R4LCByZWMpOwogICAgICAgICBicmVhazsKZGlmZiAt LWdpdCBhL3Rvb2xzL2xpYnhjL3hjX3NyX3Jlc3RvcmVfeDg2X2h2bS5jIGIvdG9vbHMvbGlieGMv eGNfc3JfcmVzdG9yZV94ODZfaHZtLmMKaW5kZXggM2Y3ODI0OGYzMi4uOTRmNDdmMjU4OSAxMDA2 NDQKLS0tIGEvdG9vbHMvbGlieGMveGNfc3JfcmVzdG9yZV94ODZfaHZtLmMKKysrIGIvdG9vbHMv bGlieGMveGNfc3JfcmVzdG9yZV94ODZfaHZtLmMKQEAgLTIzOSw2ICsyMzksNyBAQCBzdHJ1Y3Qg eGNfc3JfcmVzdG9yZV9vcHMgcmVzdG9yZV9vcHNfeDg2X2h2bSA9CiAgICAgLmxvY2FsaXNlX3Bh Z2UgICA9IHg4Nl9odm1fbG9jYWxpc2VfcGFnZSwKICAgICAuc2V0dXAgICAgICAgICAgID0geDg2 X2h2bV9zZXR1cCwKICAgICAucHJvY2Vzc19yZWNvcmQgID0geDg2X2h2bV9wcm9jZXNzX3JlY29y ZCwKKyAgICAuc3RhdGljX2RhdGFfY29tcGxldGUgPSB4ODZfc3RhdGljX2RhdGFfY29tcGxldGUs CiAgICAgLnN0cmVhbV9jb21wbGV0ZSA9IHg4Nl9odm1fc3RyZWFtX2NvbXBsZXRlLAogICAgIC5j bGVhbnVwICAgICAgICAgPSB4ODZfaHZtX2NsZWFudXAsCiB9OwpkaWZmIC0tZ2l0IGEvdG9vbHMv bGlieGMveGNfc3JfcmVzdG9yZV94ODZfcHYuYyBiL3Rvb2xzL2xpYnhjL3hjX3NyX3Jlc3RvcmVf eDg2X3B2LmMKaW5kZXggOGY2MWE1ZThiOS4uOTBiMWU1NDI3YiAxMDA2NDQKLS0tIGEvdG9vbHMv bGlieGMveGNfc3JfcmVzdG9yZV94ODZfcHYuYworKysgYi90b29scy9saWJ4Yy94Y19zcl9yZXN0 b3JlX3g4Nl9wdi5jCkBAIC02NzksNiArNjc5LDIzIEBAIHN0YXRpYyBpbnQgaGFuZGxlX3g4Nl9w dl9wMm1fZnJhbWVzKHN0cnVjdCB4Y19zcl9jb250ZXh0ICpjdHgsCiAgICAgdW5zaWduZWQgaW50 IHN0YXJ0LCBlbmQsIHgsIGZwcCA9IFBBR0VfU0laRSAvIGN0eC0+eDg2LnB2LndpZHRoOwogICAg IGludCByYzsKIAorICAgIC8qIHYyIGNvbXBhdC4gIEluZmVyIHRoZSBwb3NpdGlvbiBvZiBTVEFU SUNfREFUQV9FTkQuICovCisgICAgaWYgKCBjdHgtPnJlc3RvcmUuZm9ybWF0X3ZlcnNpb24gPCAz ICYmICFjdHgtPnJlc3RvcmUuc2Vlbl9zdGF0aWNfZGF0YV9lbmQgKQorICAgIHsKKyAgICAgICAg cmMgPSBoYW5kbGVfc3RhdGljX2RhdGFfZW5kKGN0eCk7CisgICAgICAgIGlmICggcmMgKQorICAg ICAgICB7CisgICAgICAgICAgICBFUlJPUigiSW5mZXJyZWQgU1RBVElDX0RBVEFfRU5EIHJlY29y ZCBmYWlsZWQiKTsKKyAgICAgICAgICAgIHJldHVybiByYzsKKyAgICAgICAgfQorICAgIH0KKwor ICAgIGlmICggIWN0eC0+cmVzdG9yZS5zZWVuX3N0YXRpY19kYXRhX2VuZCApCisgICAgeworICAg ICAgICBFUlJPUigiTm8gU1RBVElDX0RBVEFfRU5EIHNlZW4iKTsKKyAgICAgICAgcmV0dXJuIC0x OworICAgIH0KKwogICAgIGlmICggIWN0eC0+eDg2LnB2LnJlc3RvcmUuc2Vlbl9wdl9pbmZvICkK ICAgICB7CiAgICAgICAgIEVSUk9SKCJOb3QgeWV0IHJlY2VpdmVkIFg4Nl9QVl9JTkZPIHJlY29y ZCIpOwpAQCAtMTE2OCw2ICsxMTg1LDcgQEAgc3RydWN0IHhjX3NyX3Jlc3RvcmVfb3BzIHJlc3Rv cmVfb3BzX3g4Nl9wdiA9CiAgICAgLmxvY2FsaXNlX3BhZ2UgICA9IHg4Nl9wdl9sb2NhbGlzZV9w YWdlLAogICAgIC5zZXR1cCAgICAgICAgICAgPSB4ODZfcHZfc2V0dXAsCiAgICAgLnByb2Nlc3Nf cmVjb3JkICA9IHg4Nl9wdl9wcm9jZXNzX3JlY29yZCwKKyAgICAuc3RhdGljX2RhdGFfY29tcGxl dGUgPSB4ODZfc3RhdGljX2RhdGFfY29tcGxldGUsCiAgICAgLnN0cmVhbV9jb21wbGV0ZSA9IHg4 Nl9wdl9zdHJlYW1fY29tcGxldGUsCiAgICAgLmNsZWFudXAgICAgICAgICA9IHg4Nl9wdl9jbGVh bnVwLAogfTsKLS0gCjIuMTEuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnBy b2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94 ZW4tZGV2ZWw=