From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: Re: [PATCH v3 5/9] libxl: Rearrange qemu upstream disk argument code Date: Fri, 1 Apr 2016 15:31:35 +0100 Message-ID: <22270.34375.133949.13098@mariner.uk.xensource.com> References: <1458840160-26733-1-git-send-email-george.dunlap@citrix.com> <1458840160-26733-6-git-send-email-george.dunlap@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1458840160-26733-6-git-send-email-george.dunlap@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: George Dunlap Cc: Anthony Perard , Stefano Stabellini , Wei Liu , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org R2VvcmdlIER1bmxhcCB3cml0ZXMgKCJbUEFUQ0ggdjMgNS85XSBsaWJ4bDogUmVhcnJhbmdlIHFl bXUgdXBzdHJlYW0gZGlzayBhcmd1bWVudCBjb2RlIik6Cj4gUmVvcmdhbml6ZSB0aGUgcWVtdXUg ZGlzayBhcmd1bWVudCBjb2RlIHRvIG1ha2UgYSBjbGVhbiBzZXBhcmF0aW9uCj4gYmV0d2VlbiBm aW5kaW5nIGEgZmlsZSB0byB1c2UsIGFuZCBjb25zdHJ1Y3RpbmcgdGhlIHBhcmFtZXRlcnM6CgpU aGlzIGRpZG4ndCBhcHBseSB0byBzdGFnaW5nLCBzaW5jZSBjb2xvIHdlbnQgaW4uCkkgaGF2ZSB0 cmllZCB0byByZWJhc2UgaXQgYW5kIHRoZSByZXN1bHQgY29tcGlsZXMuCgpDYW4geW91IGNoZWNr IGl0J3MgcmlnaHQgcGxlYXNlID8KClRoYW5rcywKSWFuLgoKRnJvbSA2YWI4NmI2MzQ2MmM4ZTZk YzI0M2M3OTZmNWVhMTAyNDBhYWRjNWRlIE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBH ZW9yZ2UgRHVubGFwIDxnZW9yZ2UuZHVubGFwQGNpdHJpeC5jb20+CkRhdGU6IFRodSwgMjQgTWFy IDIwMTYgMTc6MTg6MzMgKzAwMDAKU3ViamVjdDogW1BBVENIXSBsaWJ4bDogUmVhcnJhbmdlIHFl bXUgdXBzdHJlYW0gZGlzayBhcmd1bWVudCBjb2RlCgpSZW9yZ2FuaXplIHRoZSBxZW11dSBkaXNr IGFyZ3VtZW50IGNvZGUgdG8gbWFrZSBhIGNsZWFuIHNlcGFyYXRpb24KYmV0d2VlbiBmaW5kaW5n IGEgZmlsZSB0byB1c2UsIGFuZCBjb25zdHJ1Y3RpbmcgdGhlIHBhcmFtZXRlcnM6CgoqIFJlbmFt ZSBwZGV2X3BhdGggdG8gdGFyZ2V0X3BhdGgKCiogT25seSB1c2UgcWVtdV9kaXNrX2Zvcm1hdF9z dHJpbmcoKSBpbiBjaXJjdW1zdGFuY2VzIHdoZXJlIHFlbXUgbWF5CmJlIGludGVycHJldGluZyB0 aGUgZGlzayAoaS5lLiwgYmFja2VuZD09UURJU0spLiAgSW4gYWxsIG90aGVyIGNhc2VzLAppdCBz aG91bGQgdXNlIFJBVy4KCiogU2hhcmUgYXMgbXVjaCBhcyBwb3NzaWJsZSBiZXR3ZWVuIHRoZSBp c19jZHJvbSBwYXRoIGFuZCB0aGUgbm9ybWFsCnBhdGguCgpUaGlzIGlzIG1haW5seSBwcmVwIGZv ciBzaGFyaW5nIHRoZSBsb2NhbCBwYXRoIGZpbmRlciB3aXRoIHRoZQpib290bG9hZGVyOyBidXQg aXQgZG9lcyBhbGxvdyBjZHJvbXMgdG8gdXNlIGFueSBiYWNrZW5kIHRoYXQgYSBub3JtYWwKZGlz ayBjYW4gdXNlLiBQcmV2aW91c2x5IHRoaXMgd2FzIGxpbWl0ZWQgdG8gUkFXIGZpbGVzIG9yIHRo aW5ncyB0aGF0CnFlbXUgY291bGQgaGFuZGxlIGRpcmVjdGx5OyBhcyBvZiB0aGlzIGNoYW5nZXNl dCwgaXQgbm93IGluY2x1ZGVzIHRhcApkaXNrczsgYW5kIGluIGZ1dHVyZSBjaGFuZ2VzZXRzIGl0 IHdpbGwgaW5jbHVkZSBiYWNrZW5kcyB3aXRoIGN1c3RvbQpibG9jayBzY3JpcHRzLgoKTkIgdGhh dCB0aGlzIHJldGFpbnMgYW4gZXhpc3RpbmcgYnVnLCB0aGF0IGRpc2tzIHdpdGggY3VzdG9tIGJs b2NrCnNjcmlwdHMgb3Igbm9uLWRvbTAgYmFja2VuZHMgd2lsbCBoYXZlIHRoZSBib2d1cyBwZGV2 X3BhdGggcGFzc2VkIGluCnRvIHFlbXUsIG1vc3QgbGlrZWx5IHJlc3VsdGluZyBpbiBxZW11IGV4 aXRpbmcgd2l0aCBhbiBlcnJvci4gIFRoaXMKd2lsbCBiZSBmaXhlZCBpbiBmb2xsb3ctdXAgcGF0 Y2hlcy4KClNpZ25lZC1vZmYtYnk6IEdlb3JnZSBEdW5sYXAgPGdlb3JnZS5kdW5sYXBAY2l0cml4 LmNvbT4KU2lnbmVkLW9mZi1ieTogSWFuIEphY2tzb24gPGlhbi5qYWNrc29uQGV1LmNpdHJpeC5j b20+Ci0tLQpDaGFuZ2VzIHNpbmNlIHYxOgotIE1vdmUgcWVtdXUgZGlzayBhcmd1bWVudCByZWZh Y3RvcmluZyBpbnRvIGEgc2VwYXJhdGUgcGF0Y2gKCkNDOiBJYW4gSmFja3NvbiA8aWFuLmphY2tz b25AY2l0cml4LmNvbT4KQ0M6IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+CkNDOiBTdGVm YW5vIFN0YWJlbGxpbmkgPHN0ZWZhbm8uc3RhYmVsbGluaUBjaXRyaXguY29tPgpDQzogQW50aG9u eSBQZXJhcmQgPGFudGhvbnkucGVyYXJkQGNpdHJpeC5jb20+Ci0tLQogdG9vbHMvbGlieGwvbGli eGxfZG0uYyB8ICAgNzYgKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0t LS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNDIgaW5zZXJ0aW9ucygrKSwgMzQgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwvbGlieGxfZG0uYyBiL3Rvb2xzL2xpYnhsL2xpYnhs X2RtLmMKaW5kZXggMzUyMmZiZi4uYzExZTliOCAxMDA2NDQKLS0tIGEvdG9vbHMvbGlieGwvbGli eGxfZG0uYworKysgYi90b29scy9saWJ4bC9saWJ4bF9kbS5jCkBAIC03NjEsNyArNzYxLDcgQEAg ZW51bSB7CiAgICAgTElCWExfX0NPTE9fU0VDT05EQVJZLAogfTsKIAotc3RhdGljIGNoYXIgKnFl bXVfZGlza19zY3NpX2RyaXZlX3N0cmluZyhsaWJ4bF9fZ2MgKmdjLCBjb25zdCBjaGFyICpwZGV2 X3BhdGgsCitzdGF0aWMgY2hhciAqcWVtdV9kaXNrX3Njc2lfZHJpdmVfc3RyaW5nKGxpYnhsX19n YyAqZ2MsIGNvbnN0IGNoYXIgKnRhcmdldF9wYXRoLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBpbnQgdW5pdCwgY29uc3QgY2hhciAqZm9ybWF0LAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBsaWJ4bF9kZXZpY2VfZGlzayAq ZGlzaywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IGNvbG9f bW9kZSkKQEAgLTc3NSwxNCArNzc1LDE0IEBAIHN0YXRpYyBjaGFyICpxZW11X2Rpc2tfc2NzaV9k cml2ZV9zdHJpbmcobGlieGxfX2djICpnYywgY29uc3QgY2hhciAqcGRldl9wYXRoLAogICAgIGNh c2UgTElCWExfX0NPTE9fTk9ORToKICAgICAgICAgZHJpdmUgPSBsaWJ4bF9fc3ByaW50ZgogICAg ICAgICAgICAgKGdjLCAiZmlsZT0lcyxpZj1zY3NpLGJ1cz0wLHVuaXQ9JWQsZm9ybWF0PSVzLGNh Y2hlPXdyaXRlYmFjayIsCi0gICAgICAgICAgICAgcGRldl9wYXRoLCB1bml0LCBmb3JtYXQpOwor ICAgICAgICAgICAgIHRhcmdldF9wYXRoLCB1bml0LCBmb3JtYXQpOwogICAgICAgICBicmVhazsK ICAgICBjYXNlIExJQlhMX19DT0xPX1BSSU1BUlk6CiAgICAgICAgIC8qCiAgICAgICAgICAqIHBy aW1hcnk6CiAgICAgICAgICAqICAtZGlydmUgaWY9c2NzaSxidXM9MCx1bml0PXgsY2FjaGU9d3Jp dGViYWNrLGRyaXZlcj1xdW9ydW0sXAogICAgICAgICAgKiAgaWQ9ZXhwb3J0bmFtZSxcCi0gICAg ICAgICAqICBjaGlsZHJlbi4wLmZpbGUuZmlsZW5hbWU9cGRldl9wYXRoLFwKKyAgICAgICAgICog IGNoaWxkcmVuLjAuZmlsZS5maWxlbmFtZT10YXJnZXRfcGF0aCxcCiAgICAgICAgICAqICBjaGls ZHJlbi4wLmRyaXZlcj1mb3JtYXQsXAogICAgICAgICAgKiAgcmVhZC1wYXR0ZXJuPWZpZm8sXAog ICAgICAgICAgKiAgdm90ZS10aHJlc2hvbGQ9MQpAQCAtNzk0LDcgKzc5NCw3IEBAIHN0YXRpYyBj aGFyICpxZW11X2Rpc2tfc2NzaV9kcml2ZV9zdHJpbmcobGlieGxfX2djICpnYywgY29uc3QgY2hh ciAqcGRldl9wYXRoLAogICAgICAgICAgICAgImNoaWxkcmVuLjAuZHJpdmVyPSVzLCIKICAgICAg ICAgICAgICJyZWFkLXBhdHRlcm49ZmlmbywiCiAgICAgICAgICAgICAidm90ZS10aHJlc2hvbGQ9 MSIsCi0gICAgICAgICAgICB1bml0LCBleHBvcnRuYW1lLCBwZGV2X3BhdGgsIGZvcm1hdCk7Cisg ICAgICAgICAgICB1bml0LCBleHBvcnRuYW1lLCB0YXJnZXRfcGF0aCwgZm9ybWF0KTsKICAgICAg ICAgYnJlYWs7CiAgICAgY2FzZSBMSUJYTF9fQ09MT19TRUNPTkRBUlk6CiAgICAgICAgIC8qCkBA IC04MjMsNyArODIzLDcgQEAgc3RhdGljIGNoYXIgKnFlbXVfZGlza19zY3NpX2RyaXZlX3N0cmlu ZyhsaWJ4bF9fZ2MgKmdjLCBjb25zdCBjaGFyICpwZGV2X3BhdGgsCiAgICAgcmV0dXJuIGRyaXZl OwogfQogCi1zdGF0aWMgY2hhciAqcWVtdV9kaXNrX2lkZV9kcml2ZV9zdHJpbmcobGlieGxfX2dj ICpnYywgY29uc3QgY2hhciAqcGRldl9wYXRoLAorc3RhdGljIGNoYXIgKnFlbXVfZGlza19pZGVf ZHJpdmVfc3RyaW5nKGxpYnhsX19nYyAqZ2MsIGNvbnN0IGNoYXIgKnRhcmdldF9wYXRoLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCB1bml0LCBjb25zdCBjaGFy ICpmb3JtYXQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qg bGlieGxfZGV2aWNlX2Rpc2sgKmRpc2ssCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgaW50IGNvbG9fbW9kZSkKQEAgLTgzNywxNCArODM3LDE0IEBAIHN0YXRpYyBjaGFy ICpxZW11X2Rpc2tfaWRlX2RyaXZlX3N0cmluZyhsaWJ4bF9fZ2MgKmdjLCBjb25zdCBjaGFyICpw ZGV2X3BhdGgsCiAgICAgY2FzZSBMSUJYTF9fQ09MT19OT05FOgogICAgICAgICBkcml2ZSA9IEdD U1BSSU5URgogICAgICAgICAgICAgKCJmaWxlPSVzLGlmPWlkZSxpbmRleD0lZCxtZWRpYT1kaXNr LGZvcm1hdD0lcyxjYWNoZT13cml0ZWJhY2siLAotICAgICAgICAgICAgIHBkZXZfcGF0aCwgdW5p dCwgZm9ybWF0KTsKKyAgICAgICAgICAgICB0YXJnZXRfcGF0aCwgdW5pdCwgZm9ybWF0KTsKICAg ICAgICAgYnJlYWs7CiAgICAgY2FzZSBMSUJYTF9fQ09MT19QUklNQVJZOgogICAgICAgICAvKgog ICAgICAgICAgKiBwcmltYXJ5OgogICAgICAgICAgKiAgLWRpcnZlIGlmPWlkZSxpbmRleD14LG1l ZGlhPWRpc2ssY2FjaGU9d3JpdGViYWNrLGRyaXZlcj1xdW9ydW0sXAogICAgICAgICAgKiAgaWQ9 ZXhwb3J0bmFtZSxcCi0gICAgICAgICAqICBjaGlsZHJlbi4wLmZpbGUuZmlsZW5hbWU9cGRldl9w YXRoLFwKKyAgICAgICAgICogIGNoaWxkcmVuLjAuZmlsZS5maWxlbmFtZT10YXJnZXRfcGF0aCxc CiAgICAgICAgICAqICBjaGlsZHJlbi4wLmRyaXZlcj1mb3JtYXQsXAogICAgICAgICAgKiAgcmVh ZC1wYXR0ZXJuPWZpZm8sXAogICAgICAgICAgKiAgdm90ZS10aHJlc2hvbGQ9MQpAQCAtODU2LDcg Kzg1Niw3IEBAIHN0YXRpYyBjaGFyICpxZW11X2Rpc2tfaWRlX2RyaXZlX3N0cmluZyhsaWJ4bF9f Z2MgKmdjLCBjb25zdCBjaGFyICpwZGV2X3BhdGgsCiAgICAgICAgICAgICAiY2hpbGRyZW4uMC5k cml2ZXI9JXMsIgogICAgICAgICAgICAgInJlYWQtcGF0dGVybj1maWZvLCIKICAgICAgICAgICAg ICJ2b3RlLXRocmVzaG9sZD0xIiwKLSAgICAgICAgICAgICB1bml0LCBleHBvcnRuYW1lLCBwZGV2 X3BhdGgsIGZvcm1hdCk7CisgICAgICAgICAgICAgdW5pdCwgZXhwb3J0bmFtZSwgdGFyZ2V0X3Bh dGgsIGZvcm1hdCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgTElCWExfX0NPTE9fU0VDT05E QVJZOgogICAgICAgICAvKgpAQCAtMTMwNSw5ICsxMzA1LDkgQEAgc3RhdGljIGludCBsaWJ4bF9f YnVpbGRfZGV2aWNlX21vZGVsX2FyZ3NfbmV3KGxpYnhsX19nYyAqZ2MsCiAgICAgICAgICAgICBp bnQgZGlzaywgcGFydDsKICAgICAgICAgICAgIGludCBkZXZfbnVtYmVyID0KICAgICAgICAgICAg ICAgICBsaWJ4bF9fZGV2aWNlX2Rpc2tfZGV2X251bWJlcihkaXNrc1tpXS52ZGV2LCAmZGlzaywg JnBhcnQpOwotICAgICAgICAgICAgY29uc3QgY2hhciAqZm9ybWF0ID0gcWVtdV9kaXNrX2Zvcm1h dF9zdHJpbmcoZGlza3NbaV0uZm9ybWF0KTsKKyAgICAgICAgICAgIGNvbnN0IGNoYXIgKmZvcm1h dDsKICAgICAgICAgICAgIGNoYXIgKmRyaXZlOwotICAgICAgICAgICAgY29uc3QgY2hhciAqcGRl dl9wYXRoOworICAgICAgICAgICAgY29uc3QgY2hhciAqdGFyZ2V0X3BhdGg7CiAgICAgICAgICAg ICBpbnQgY29sb19tb2RlOwogCiAgICAgICAgICAgICBpZiAoZGV2X251bWJlciA9PSAtMSkgewpA QCAtMTMxNiwyMiArMTMxNiwyMiBAQCBzdGF0aWMgaW50IGxpYnhsX19idWlsZF9kZXZpY2VfbW9k ZWxfYXJnc19uZXcobGlieGxfX2djICpnYywKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAg ICAgICAgICAgIH0KIAotICAgICAgICAgICAgaWYgKGRpc2tzW2ldLmlzX2Nkcm9tKSB7Ci0gICAg ICAgICAgICAgICAgaWYgKGRpc2tzW2ldLmZvcm1hdCA9PSBMSUJYTF9ESVNLX0ZPUk1BVF9FTVBU WSkKLSAgICAgICAgICAgICAgICAgICAgZHJpdmUgPSBsaWJ4bF9fc3ByaW50ZgotICAgICAgICAg ICAgICAgICAgICAgICAgKGdjLCAiaWY9aWRlLGluZGV4PSVkLHJlYWRvbmx5PSVzLG1lZGlhPWNk cm9tLGNhY2hlPXdyaXRlYmFjayxpZD1pZGUtJWkiLAotICAgICAgICAgICAgICAgICAgICAgICAg IGRpc2ssIGRpc2tzW2ldLnJlYWR3cml0ZSA/ICJvZmYiIDogIm9uIiwgZGV2X251bWJlcik7Ci0g ICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICBkcml2ZSA9IGxpYnhsX19z cHJpbnRmCi0gICAgICAgICAgICAgICAgICAgICAgICAoZ2MsICJmaWxlPSVzLGlmPWlkZSxpbmRl eD0lZCxyZWFkb25seT0lcyxtZWRpYT1jZHJvbSxmb3JtYXQ9JXMsY2FjaGU9d3JpdGViYWNrLGlk PWlkZS0laSIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgZGlza3NbaV0ucGRldl9wYXRoLCBk aXNrLCBkaXNrc1tpXS5yZWFkd3JpdGUgPyAib2ZmIiA6ICJvbiIsIGZvcm1hdCwgZGV2X251bWJl cik7Ci0gICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIGlmIChkaXNrc1tpXS5m b3JtYXQgPT0gTElCWExfRElTS19GT1JNQVRfRU1QVFkpIHsKKyAgICAgICAgICAgIC8qIAorICAg ICAgICAgICAgICogSWYgcWVtdSBpc24ndCBkb2luZyB0aGUgaW50ZXJwcmV0aW5nLCB0aGUgcGFy YW1ldGVyIGlzCisgICAgICAgICAgICAgKiBhbHdheXMgcmF3CisgICAgICAgICAgICAgKi8KKyAg ICAgICAgICAgIGlmIChkaXNrc1tpXS5iYWNrZW5kID09IExJQlhMX0RJU0tfQkFDS0VORF9RRElT SykKKyAgICAgICAgICAgICAgICBmb3JtYXQgPSBxZW11X2Rpc2tfZm9ybWF0X3N0cmluZyhkaXNr c1tpXS5mb3JtYXQpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIGZvcm1hdCA9 IHFlbXVfZGlza19mb3JtYXRfc3RyaW5nKExJQlhMX0RJU0tfRk9STUFUX1JBVyk7CisKKyAgICAg ICAgICAgIGlmIChkaXNrc1tpXS5mb3JtYXQgPT0gTElCWExfRElTS19GT1JNQVRfRU1QVFkpIHsK KyAgICAgICAgICAgICAgICBpZiAoIWRpc2tzW2ldLmlzX2Nkcm9tKSB7CiAgICAgICAgICAgICAg ICAgICAgIExPRyhXQVJOLCAiY2Fubm90IHN1cHBvcnQiIiBlbXB0eSBkaXNrIGZvcm1hdCBmb3Ig JXMiLAogICAgICAgICAgICAgICAgICAgICAgICAgZGlza3NbaV0udmRldik7CiAgICAgICAgICAg ICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgICAgIH0KLQorICAgICAgICAgICAgfSBl bHNlIHsKICAgICAgICAgICAgICAgICBpZiAoZm9ybWF0ID09IE5VTEwpIHsKICAgICAgICAgICAg ICAgICAgICAgTE9HKFdBUk4sCiAgICAgICAgICAgICAgICAgICAgICAgICAidW5hYmxlIHRvIGRl dGVybWluZSIiIGRpc2sgaW1hZ2UgZm9ybWF0ICVzIiwKQEAgLTEzMzksMTQgKzEzMzksMjIgQEAg c3RhdGljIGludCBsaWJ4bF9fYnVpbGRfZGV2aWNlX21vZGVsX2FyZ3NfbmV3KGxpYnhsX19nYyAq Z2MsCiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgICAgIH0KIAot ICAgICAgICAgICAgICAgIGlmIChkaXNrc1tpXS5iYWNrZW5kID09IExJQlhMX0RJU0tfQkFDS0VO RF9UQVApIHsKLSAgICAgICAgICAgICAgICAgICAgZm9ybWF0ID0gcWVtdV9kaXNrX2Zvcm1hdF9z dHJpbmcoTElCWExfRElTS19GT1JNQVRfUkFXKTsKLSAgICAgICAgICAgICAgICAgICAgcGRldl9w YXRoID0gbGlieGxfX2Jsa3RhcF9kZXZwYXRoKGdjLCBkaXNrc1tpXS5wZGV2X3BhdGgsCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaXNrc1tp XS5mb3JtYXQpOwotICAgICAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgICAg IHBkZXZfcGF0aCA9IGRpc2tzW2ldLnBkZXZfcGF0aDsKLSAgICAgICAgICAgICAgICB9CisgICAg ICAgICAgICAgICAgaWYgKGRpc2tzW2ldLmJhY2tlbmQgPT0gTElCWExfRElTS19CQUNLRU5EX1RB UCkKKyAgICAgICAgICAgICAgICAgICAgdGFyZ2V0X3BhdGggPSBsaWJ4bF9fYmxrdGFwX2RldnBh dGgoZ2MsIGRpc2tzW2ldLnBkZXZfcGF0aCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlza3NbaV0uZm9ybWF0KTsKKyAgICAgICAgICAg ICAgICBlbHNlICAgICAKKyAgICAgICAgICAgICAgICAgICAgdGFyZ2V0X3BhdGggPSBkaXNrc1tp XS5wZGV2X3BhdGg7CisgICAgICAgICAgICB9CiAKKyAgICAgICAgICAgIGlmIChkaXNrc1tpXS5p c19jZHJvbSkgeworICAgICAgICAgICAgICAgIGRyaXZlID0gbGlieGxfX3NwcmludGYoZ2MsCisg ICAgICAgICAgICAgICAgICAgICAgICAgImlmPWlkZSxpbmRleD0lZCxyZWFkb25seT0lcyxtZWRp YT1jZHJvbSxjYWNoZT13cml0ZWJhY2ssaWQ9aWRlLSVpIiwKKyAgICAgICAgICAgICAgICAgICAg ICAgICBkaXNrLCBkaXNrc1tpXS5yZWFkd3JpdGUgPyAib2ZmIiA6ICJvbiIsIGRldl9udW1iZXIp OworCisgICAgICAgICAgICAgICAgaWYgKHRhcmdldF9wYXRoKQorICAgICAgICAgICAgICAgICAg ICBkcml2ZSA9IGxpYnhsX19zcHJpbnRmKGdjLCAiJXMsZmlsZT0lcyxmb3JtYXQ9JXMiLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRyaXZlLCB0YXJnZXRfcGF0 aCwgZm9ybWF0KTsKKyAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgLyoKICAg ICAgICAgICAgICAgICAgKiBFeHBsaWNpdCBzZCBkaXNrcyBhcmUgcGFzc2VkIHRocm91Z2ggYXMg aXMuCiAgICAgICAgICAgICAgICAgICoKQEAgLTEzNjcsMTIgKzEzNzUsMTIgQEAgc3RhdGljIGlu dCBsaWJ4bF9fYnVpbGRfZGV2aWNlX21vZGVsX2FyZ3NfbmV3KGxpYnhsX19nYyAqZ2MsCiAgICAg ICAgICAgICAgICAgICAgIGlmIChjb2xvX21vZGUgPT0gTElCWExfX0NPTE9fU0VDT05EQVJZKSB7 CiAgICAgICAgICAgICAgICAgICAgICAgICBkcml2ZSA9IGxpYnhsX19zcHJpbnRmCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgKGdjLCAiaWY9bm9uZSxkcml2ZXI9JXMsZmlsZT0lcyxpZD0l cyIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZvcm1hdCwgcGRldl9wYXRoLCBkaXNr c1tpXS5jb2xvX2V4cG9ydCk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZvcm1hdCwg dGFyZ2V0X3BhdGgsIGRpc2tzW2ldLmNvbG9fZXhwb3J0KTsKIAogICAgICAgICAgICAgICAgICAg ICAgICAgZmxleGFycmF5X2FwcGVuZChkbV9hcmdzLCAiLWRyaXZlIik7CiAgICAgICAgICAgICAg ICAgICAgICAgICBmbGV4YXJyYXlfYXBwZW5kKGRtX2FyZ3MsIGRyaXZlKTsKICAgICAgICAgICAg ICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICBkcml2ZSA9IHFlbXVfZGlza19zY3NpX2Ry aXZlX3N0cmluZyhnYywgcGRldl9wYXRoLCBkaXNrLAorICAgICAgICAgICAgICAgICAgICBkcml2 ZSA9IHFlbXVfZGlza19zY3NpX2RyaXZlX3N0cmluZyhnYywgdGFyZ2V0X3BhdGgsIGRpc2ssCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZv cm1hdCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgJmRpc2tzW2ldLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb2xvX21vZGUpOwpAQCAtMTM4OSw3ICsxMzk3LDcgQEAgc3RhdGlj IGludCBsaWJ4bF9fYnVpbGRfZGV2aWNlX21vZGVsX2FyZ3NfbmV3KGxpYnhsX19nYyAqZ2MsCiAg ICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgZmxleGFycmF5X3ZhcHBl bmQoZG1fYXJncywgIi1kcml2ZSIsCiAgICAgICAgICAgICAgICAgICAgICAgICBHQ1NQUklOVEYo ImZpbGU9JXMsaWY9bm9uZSxpZD1haGNpZGlzay0lZCxmb3JtYXQ9JXMsY2FjaGU9d3JpdGViYWNr IiwKLSAgICAgICAgICAgICAgICAgICAgICAgIHBkZXZfcGF0aCwgZGlzaywgZm9ybWF0KSwKKyAg ICAgICAgICAgICAgICAgICAgICAgIHRhcmdldF9wYXRoLCBkaXNrLCBmb3JtYXQpLAogICAgICAg ICAgICAgICAgICAgICAgICAgIi1kZXZpY2UiLCBHQ1NQUklOVEYoImlkZS1oZCxidXM9YWhjaTAu JWQsdW5pdD0wLGRyaXZlPWFoY2lkaXNrLSVkIiwKICAgICAgICAgICAgICAgICAgICAgICAgIGRp c2ssIGRpc2spLCBOVUxMKTsKICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CkBAIC0xNDAx LDEyICsxNDA5LDEyIEBAIHN0YXRpYyBpbnQgbGlieGxfX2J1aWxkX2RldmljZV9tb2RlbF9hcmdz X25ldyhsaWJ4bF9fZ2MgKmdjLAogICAgICAgICAgICAgICAgICAgICBpZiAoY29sb19tb2RlID09 IExJQlhMX19DT0xPX1NFQ09OREFSWSkgewogICAgICAgICAgICAgICAgICAgICAgICAgZHJpdmUg PSBsaWJ4bF9fc3ByaW50ZgogICAgICAgICAgICAgICAgICAgICAgICAgICAgIChnYywgImlmPW5v bmUsZHJpdmVyPSVzLGZpbGU9JXMsaWQ9JXMiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBmb3JtYXQsIHBkZXZfcGF0aCwgZGlza3NbaV0uY29sb19leHBvcnQpOworICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBmb3JtYXQsIHRhcmdldF9wYXRoLCBkaXNrc1tpXS5jb2xvX2V4cG9y dCk7CiAKICAgICAgICAgICAgICAgICAgICAgICAgIGZsZXhhcnJheV9hcHBlbmQoZG1fYXJncywg Ii1kcml2ZSIpOwogICAgICAgICAgICAgICAgICAgICAgICAgZmxleGFycmF5X2FwcGVuZChkbV9h cmdzLCBkcml2ZSk7CiAgICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICAgICAg ZHJpdmUgPSBxZW11X2Rpc2tfaWRlX2RyaXZlX3N0cmluZyhnYywgcGRldl9wYXRoLCBkaXNrLAor ICAgICAgICAgICAgICAgICAgICBkcml2ZSA9IHFlbXVfZGlza19pZGVfZHJpdmVfc3RyaW5nKGdj LCB0YXJnZXRfcGF0aCwgZGlzaywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBmb3JtYXQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgJmRpc2tzW2ldLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbG9fbW9kZSk7Ci0tIAoxLjcu MTAuNAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhl bi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cDovL2xpc3Rz Lnhlbi5vcmcveGVuLWRldmVsCg==