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 2A4C4C4360C for ; Thu, 10 Oct 2019 15:11:55 +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 E39D0206A1 for ; Thu, 10 Oct 2019 15:11:54 +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="Nr59NXjM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E39D0206A1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=eu.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 1iIa6S-0006U6-DB; Thu, 10 Oct 2019 15:11:44 +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 1iIa6Q-0006Sy-OO for xen-devel@lists.xenproject.org; Thu, 10 Oct 2019 15:11:42 +0000 X-Inumbo-ID: 3836e23a-eb70-11e9-931d-12813bfff9fa Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 3836e23a-eb70-11e9-931d-12813bfff9fa; Thu, 10 Oct 2019 15:11:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1570720282; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=x0GSJI7FhlKu54G0XL0TZl0FN98pVKdYaMyV6+/nAek=; b=Nr59NXjM+y8oLiKJyXqUagfISW2VRXOVmUB+tnp4EIkc4J1DEN0yE+c0 g6Yem44z4ZPp9yiNVEq2lRgd6zWgdGycf5eMSMFTezkkPmtvZS7fwfgC0 PhJqbMgOzcNoJSyiqFpyUJLf7GdbaKtwYukCVq5BLdqabTBd8QEOOEfY7 Y=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=ian.jackson@eu.citrix.com; spf=Pass smtp.mailfrom=Ian.Jackson@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa4.hc3370-68.iphmx.com: no sender authenticity information available from domain of ian.jackson@eu.citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa4.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="ian.jackson@eu.citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa4.hc3370-68.iphmx.com: domain of Ian.Jackson@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa4.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="Ian.Jackson@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 (esa4.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=esa4.hc3370-68.iphmx.com; envelope-from="Ian.Jackson@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: YkD8ogw6c4FJPV7sz5trDx+wH4BqTZAXKtBTQay+QNWIQuJ/DpR8KiYAIvUogSbl0B3s+n7k96 jRwQxEK/0NgWId67sqR8t+JqIoRCCOxZKPa+ff3TOZ0+cenlWaOD5KBN+f+BetT07mrfoR0wsQ wjIu7yrMrX529akkxUHG9Xvh+qqoISK6WgxwKJ9qG3yMzAgp/Y22EZ4Q6loYFe9UitzdotADDW KQQuXeZ2bk+f4Uf/55LurRM5aul/ll2fT5+73lumHqIGekMv5nRHosoE9EDwBnPZzhaDGt3nUX PRY= X-SBRS: 2.7 X-MesageID: 7110105 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.67,280,1566878400"; d="scan'208";a="7110105" From: Ian Jackson To: Date: Thu, 10 Oct 2019 16:11:11 +0100 Message-ID: <20191010151111.22125-10-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191010151111.22125-1-ian.jackson@eu.citrix.com> References: <20191010151111.22125-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [XEN PATCH for-4.13 v2 9/9] libxl/xl: Overhaul passthrough setting logic 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: Wei Liu , Andrew Cooper , Ian Jackson , Paul Durrant , Jan Beulich , Anthony PERARD Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" TElCWExfUEFTU1RIUk9VR0hfVU5LTk9XTiAoYWthICJFTkFCTEVEIiBpbiBhbiBlYXJsaWVyIHVu Y29tbWl0dGVkCnZlcnNpb24gb2YgdGhpcyBjb2RlKSBpcyBkb2luZyBkb3VibGUgZHV0eS4gIFdl IGFjdHVhbGx5IG5lZWQgYWxsIG9mCnRoZSBmb2xsb3dpbmcgdG8gYmUgc3BlY2lmaWNhYmxlOgog ICogZGVmYXVsdCAoInVua25vd24iKTogZW5hYmxlIFBUIGlmZiB3ZSBoYXZlIGRldmljZXMgdG8K ICAgIHBhc3MgdGhyb3VnaCBzcGVjaWZpZWQgaW4gdGhlIGluaXRpYWwgY29uZmlnIGZpbGUuCiAg KiAiZW5hYmxlZCIgKGFuZCBmYWlsIGlmIHRoZSBwbGF0Zm9ybSBkb2Vzbid0IHN1cHBvcnQgaXQp LgogICogImRpc2FibGVkIiAoYW5kIHJlamVjdCBmdXR1cmUgUFQgaG90cGx1ZykuCiAgKiAic2hh cmVfcHQiLyJzeW5jX3B0IjogZW5hYmxlIFBUIGFuZCBzZXQgYSBzcGVjaWZpYyBQVCBtb2RlLgoK RGVmYXVsdGluZyBhbmQgZXJyb3IgY2hlY2tpbmcgc2hvdWxkIGJlIGRvbmUgaW4gbGlieGwuICBT bywgd2UgbWFrZQpzZXZlcmFsIGNoYW5nZXMgaGVyZS4KCldlIGludHJvZHVjZSAiZW5hYmxlZCIu ICAoQW5kIHdlIGRvY3VtZW50ICJ1bmtub3duIi4pCgpXZSBtb3ZlIGFsbCBvZiB0aGUgZXJyb3Ig Y2hlY2tpbmcgYW5kIGRlZmF1bHRpbmcgY29kZSBmcm9tIHhsIGludG8KbGlieGwuICBOb3csIGxp YnhsX19kb21haW5fY29uZmlnX3NldGRlZmF1bHQgaGFzIGFsbCBvZiB0aGUgbmVjZXNzYXJ5Cmlu Zm9ybWF0aW9uIHRvIGdldCB0aGlzIHJpZ2h0LiAgU28gd2UgY2FuIGRvIGl0IGFsbCB0aGVyZSwg aW4gb25lCnBsYWNlLgoKV2UgY2FuIGFsc28gYXJyYW5nZSB0byBoYXZlIG9ubHkgb25lIHBsYWNl IGVhY2ggd2hpY2ggY2FsY3VsYXRlcwooaSkgd2hldGhlciBwYXNzdGhyb3VnaCBuZWVkcyB0byBi ZSBlbmFibGVkIGJlY2F1c2UgcHQgZGV2aWNlcyB3ZXJlCnNwZWNpZmllZCAoaWkpIHdoZXRoZXIg cHRfc2hhcmUgY2FuIGJlIHVzZWQuCgp4bCBub3cgb25seSBoYXMgdG8gcGFyc2UgdGhlIGVudW0g aW4gdGhlIHNhbWUgd2F5IGFzIGl0IHBhcnNlcyBhbGwKb3RoZXIgZW51bXMuCgpUaGlzIGNoYW5n ZSBmaXhlcyBhIHJlZ3Jlc3Npb24gZnJvbSBlYXJsaWVyIDQuMTMtcHJlOiB1bnRpbCByZWNlbnQK Y2hhbmdlcywgcGFzc3Rocm91Z2ggd2FzIG9ubHkgZW5hYmxlZCBieSBkZWZhdWx0IGlmIHBhc3N0 aHJvdWdoCmRldmljZXMgd2VyZSBzcGVjaWZpZWQuICBXZSByZXN0b3JlIHRoaXMgYmVoYXZpb3Vy LgoKVGhpcyB3aWxsIGhpZGUsIGZyb20gdGhlIHBvaW50IG9mIHZpZXcgb2YgbGlidmlydCB0ZXN0 cyBpbiBvc3N0ZXN0LCBhCnNlcGFyYXRlIGh5cGVydmlzb3IgcmVncmVzc2lvbiB3aGljaCBwcmV2 ZW50cyBtaWdyYXRpb24gb2YgYSBkb21haW4Kd2l0aCBwYXNzdGhyb3VnaCBlbmFibGVkIGJ1dCB3 aXRob3V0IGFjdHVhbCBQVCBkZXZpY2VzLgoKU2lnbmVkLW9mZi1ieTogSWFuIEphY2tzb24gPGlh bi5qYWNrc29uQGV1LmNpdHJpeC5jb20+Ci0tLQp2MjogTmV3IHBhdGNoIGluIHRoaXMgdmVyc2lv biBvZiB0aGUgc2VyaWVzLgotLS0KIHRvb2xzL2xpYnhsL2xpYnhsX2NyZWF0ZS5jICB8IDU3ICsr KysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tCiB0b29scy9saWJ4bC9saWJ4bF90 eXBlcy5pZGwgfCAgNSArKy0tCiB0b29scy94bC94bF9wYXJzZS5jICAgICAgICAgfCA2NyArKysr LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdl ZCwgNTMgaW5zZXJ0aW9ucygrKSwgNzYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdG9vbHMv bGlieGwvbGlieGxfY3JlYXRlLmMgYi90b29scy9saWJ4bC9saWJ4bF9jcmVhdGUuYwppbmRleCA2 OTk3MWM5N2I2Li5mY2NiNmE2MjcxIDEwMDY0NAotLS0gYS90b29scy9saWJ4bC9saWJ4bF9jcmVh dGUuYworKysgYi90b29scy9saWJ4bC9saWJ4bF9jcmVhdGUuYwpAQCAtNTcsMTggKzU3LDYgQEAg aW50IGxpYnhsX19kb21haW5fY3JlYXRlX2luZm9fc2V0ZGVmYXVsdChsaWJ4bF9fZ2MgKmdjLAog ICAgIGlmICghY19pbmZvLT5zc2lkcmVmKQogICAgICAgICBjX2luZm8tPnNzaWRyZWYgPSBTRUNJ TklUU0lEX0RPTVU7CiAKLSAgICBpZiAoaW5mby0+Y2FwX2h2bV9kaXJlY3RpbyAmJgotICAgICAg ICAoY19pbmZvLT5wYXNzdGhyb3VnaCA9PSBMSUJYTF9QQVNTVEhST1VHSF9VTktOT1dOKSkgewot ICAgICAgICBjX2luZm8tPnBhc3N0aHJvdWdoID0gKChjX2luZm8tPnR5cGUgPT0gTElCWExfRE9N QUlOX1RZUEVfUFYpIHx8Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIWluZm8tPmNh cF9pb21tdV9oYXBfcHRfc2hhcmUpID8KLSAgICAgICAgICAgIExJQlhMX1BBU1NUSFJPVUdIX1NZ TkNfUFQgOiBMSUJYTF9QQVNTVEhST1VHSF9TSEFSRV9QVDsKLSAgICB9IGVsc2UgaWYgKCFpbmZv LT5jYXBfaHZtX2RpcmVjdGlvKSB7Ci0gICAgICAgIGNfaW5mby0+cGFzc3Rocm91Z2ggPSBMSUJY TF9QQVNTVEhST1VHSF9ESVNBQkxFRDsKLSAgICB9Ci0KLSAgICAvKiBBbiBleHBsaWNpdCBzZXR0 aW5nIHNob3VsZCBub3cgaGF2ZSBiZWVuIGNob3NlbiAqLwotICAgIGFzc2VydChjX2luZm8tPnBh c3N0aHJvdWdoICE9IExJQlhMX1BBU1NUSFJPVUdIX1VOS05PV04pOwotCiAgICAgcmV0dXJuIDA7 CiB9CiAKQEAgLTkwNCw2ICs4OTIsNyBAQCBpbnQgbGlieGxfX2RvbWFpbl9jb25maWdfc2V0ZGVm YXVsdChsaWJ4bF9fZ2MgKmdjLAogICAgIGxpYnhsX2N0eCAqY3R4ID0gbGlieGxfX2djX293bmVy KGdjKTsKICAgICBpbnQgcmV0OwogICAgIGJvb2wgcG9kX2VuYWJsZWQgPSBmYWxzZTsKKyAgICBs aWJ4bF9kb21haW5fY3JlYXRlX2luZm8gKmNfaW5mbyA9ICZkX2NvbmZpZy0+Y19pbmZvOwogCiAg ICAgbGlieGxfcGh5c2luZm8gcGh5c2luZm87CiAgICAgcmV0ID0gbGlieGxfZ2V0X3BoeXNpbmZv KENUWCwgJnBoeXNpbmZvKTsKQEAgLTk2OCw2ICs5NTcsNTAgQEAgaW50IGxpYnhsX19kb21haW5f Y29uZmlnX3NldGRlZmF1bHQobGlieGxfX2djICpnYywKICAgICAgICAgZ290byBlcnJvcl9vdXQ7 CiAgICAgfQogCisgICAgYm9vbCBuZWVkX3B0ID0gZF9jb25maWctPm51bV9wY2lkZXZzIHx8IGRf Y29uZmlnLT5udW1fZHRkZXZzOworICAgIGlmIChjX2luZm8tPnBhc3N0aHJvdWdoID09IExJQlhM X1BBU1NUSFJPVUdIX1VOS05PV04pIHsKKyAgICAgICAgY19pbmZvLT5wYXNzdGhyb3VnaCA9IG5l ZWRfcHQKKyAgICAgICAgICAgID8gTElCWExfUEFTU1RIUk9VR0hfRU5BQkxFRCA6IExJQlhMX1BB U1NUSFJPVUdIX0RJU0FCTEVEOworICAgIH0KKworICAgIGJvb2wgaW9tbXVfZW5hYmxlZCA9IHBo eXNpbmZvLmNhcF9odm1fZGlyZWN0aW87CisgICAgaWYgKGNfaW5mby0+cGFzc3Rocm91Z2ggIT0g TElCWExfUEFTU1RIUk9VR0hfRElTQUJMRUQgJiYgIWlvbW11X2VuYWJsZWQpIHsKKyAgICAgICAg TE9HRChFUlJPUiwgZG9taWQsCisgICAgICAgICAgICAgIkVSUk9SOiBwYXNzdGhyb3VnaCBub3Qg c3VwcG9ydGVkIG9uIHRoaXMgcGxhdGZvcm1cbiIpOworICAgICAgICByZXQgPSBFUlJPUl9JTlZB TDsKKyAgICAgICAgZ290byBlcnJvcl9vdXQ7CisgICAgfQorCisgICAgaWYgKGNfaW5mby0+cGFz c3Rocm91Z2ggPT0gTElCWExfUEFTU1RIUk9VR0hfRElTQUJMRUQgJiYgbmVlZF9wdCkgeworICAg ICAgICBMT0dEKEVSUk9SLCBkb21pZCwKKyAgICAgICAgICAgICAicGFzc3Rocm91Z2ggZGlzYWJs ZWQgYnV0IGRldmljZXMgYXJlIHNwZWNpZmllZCIpOworICAgICAgICByZXQgPSBFUlJPUl9JTlZB TDsKKyAgICAgICAgZ290byBlcnJvcl9vdXQ7CisgICAgfQorCisgICAgY29uc3QgY2hhciAqd2h5 bm90X3B0X3NoYXJlID0KKyAgICAgICAgY19pbmZvLT50eXBlID09IExJQlhMX0RPTUFJTl9UWVBF X1BWID8gIm5vdCB2YWxpZCBmb3IgUFYgZG9tYWluIiA6CisgICAgICAgICFwaHlzaW5mby5jYXBf aW9tbXVfaGFwX3B0X3NoYXJlID8gIm5vdCBzdXBwb3J0ZWQgb24gdGhpcyBwbGF0Zm9ybSIgOgor ICAgICAgICBOVUxMOworCisgICAgaWYgKGNfaW5mby0+cGFzc3Rocm91Z2ggPT0gTElCWExfUEFT U1RIUk9VR0hfRU5BQkxFRCkgeworICAgICAgICBhc3NlcnQoaW9tbXVfZW5hYmxlZCk7CisgICAg ICAgIGNfaW5mby0+cGFzc3Rocm91Z2ggPSB3aHlub3RfcHRfc2hhcmUKKyAgICAgICAgICAgID8g TElCWExfUEFTU1RIUk9VR0hfU1lOQ19QVCA6IExJQlhMX1BBU1NUSFJPVUdIX1NIQVJFX1BUOwor ICAgIH0KKworICAgIGlmIChjX2luZm8tPnBhc3N0aHJvdWdoID09IExJQlhMX1BBU1NUSFJPVUdI X1NIQVJFX1BUICYmIHdoeW5vdF9wdF9zaGFyZSkgeworICAgICAgICBMT0dEKEVSUk9SLCBkb21p ZCwKKyAgICAgICAgICAgICAiRVJST1I6IHBhc3N0aHJvdWdoPVwic2hhcmVfcHRcIiAlc1xuIiwK KyAgICAgICAgICAgICB3aHlub3RfcHRfc2hhcmUpOworICAgICAgICByZXQgPSBFUlJPUl9JTlZB TDsKKyAgICAgICAgZ290byBlcnJvcl9vdXQ7CisgICAgfQorCisgICAgLyogQW4gZXhwbGljaXQg c2V0dGluZyBzaG91bGQgbm93IGhhdmUgYmVlbiBjaG9zZW4gKi8KKyAgICBhc3NlcnQoY19pbmZv LT5wYXNzdGhyb3VnaCAhPSBMSUJYTF9QQVNTVEhST1VHSF9VTktOT1dOKTsKKyAgICBhc3NlcnQo Y19pbmZvLT5wYXNzdGhyb3VnaCAhPSBMSUJYTF9QQVNTVEhST1VHSF9FTkFCTEVEKTsKKwogICAg IC8qIElmIHRhcmdldF9tZW1rYiBpcyBzbWFsbGVyIHRoYW4gbWF4X21lbWtiLCB0aGUgc3Vic2Vx dWVudCBjYWxsCiAgICAgICogdG8gbGlieGMgd2hlbiBidWlsZGluZyBIVk0gZG9tYWluIHdpbGwg ZW5hYmxlIFBvRCBtb2RlLgogICAgICAqLwpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwvbGlieGxf dHlwZXMuaWRsIGIvdG9vbHMvbGlieGwvbGlieGxfdHlwZXMuaWRsCmluZGV4IDNhYzk0OTRiODAu LjI0NDFjMGMyMzMgMTAwNjQ0Ci0tLSBhL3Rvb2xzL2xpYnhsL2xpYnhsX3R5cGVzLmlkbAorKysg Yi90b29scy9saWJ4bC9saWJ4bF90eXBlcy5pZGwKQEAgLTI2Niw4ICsyNjYsOSBAQCBsaWJ4bF92 a2JfYmFja2VuZCA9IEVudW1lcmF0aW9uKCJ2a2JfYmFja2VuZCIsIFsKIGxpYnhsX3Bhc3N0aHJv dWdoID0gRW51bWVyYXRpb24oInBhc3N0aHJvdWdoIiwgWwogICAgICgwLCAidW5rbm93biIpLAog ICAgICgxLCAiZGlzYWJsZWQiKSwKLSAgICAoMiwgInN5bmNfcHQiKSwKLSAgICAoMywgInNoYXJl X3B0IiksCisgICAgKDIsICJlbmFibGVkIiksCisgICAgKDMsICJzeW5jX3B0IiksCisgICAgKDQs ICJzaGFyZV9wdCIpLAogICAgIF0pCiAKICMKZGlmZiAtLWdpdCBhL3Rvb2xzL3hsL3hsX3BhcnNl LmMgYi90b29scy94bC94bF9wYXJzZS5jCmluZGV4IDc5ODcxYzIyZDAuLjExMmY4ZWUwMjYgMTAw NjQ0Ci0tLSBhL3Rvb2xzL3hsL3hsX3BhcnNlLmMKKysrIGIvdG9vbHMveGwveGxfcGFyc2UuYwpA QCAtMTIyMiw3ICsxMjIyLDYgQEAgdm9pZCBwYXJzZV9jb25maWdfZGF0YShjb25zdCBjaGFyICpj b25maWdfc291cmNlLAogICAgIGludCBwY2lfc2VpemUgPSAwOwogICAgIGludCBpLCBlOwogICAg IGNoYXIgKmtlcm5lbF9iYXNlbmFtZTsKLSAgICBib29sIGlvbW11X2VuYWJsZWQsIGlvbW11X2hh cF9wdF9zaGFyZTsKIAogICAgIGxpYnhsX2RvbWFpbl9jcmVhdGVfaW5mbyAqY19pbmZvID0gJmRf Y29uZmlnLT5jX2luZm87CiAgICAgbGlieGxfZG9tYWluX2J1aWxkX2luZm8gKmJfaW5mbyA9ICZk X2NvbmZpZy0+Yl9pbmZvOwpAQCAtMTIzNCw4ICsxMjMzLDYgQEAgdm9pZCBwYXJzZV9jb25maWdf ZGF0YShjb25zdCBjaGFyICpjb25maWdfc291cmNlLAogICAgICAgICBleGl0KEVYSVRfRkFJTFVS RSk7CiAgICAgfQogCi0gICAgaW9tbXVfZW5hYmxlZCA9IHBoeXNpbmZvLmNhcF9odm1fZGlyZWN0 aW87Ci0gICAgaW9tbXVfaGFwX3B0X3NoYXJlID0gcGh5c2luZm8uY2FwX2lvbW11X2hhcF9wdF9z aGFyZTsKICAgICBsaWJ4bF9waHlzaW5mb19kaXNwb3NlKCZwaHlzaW5mbyk7CiAKICAgICBjb25m aWc9IHhsdV9jZmdfaW5pdChzdGRlcnIsIGNvbmZpZ19zb3VyY2UpOwpAQCAtMTUwOSw2NyArMTUw NiwxMyBAQCB2b2lkIHBhcnNlX2NvbmZpZ19kYXRhKGNvbnN0IGNoYXIgKmNvbmZpZ19zb3VyY2Us CiAgICAgICAgIH0KICAgICB9CiAKLSAgICBpZiAoeGx1X2NmZ19nZXRfc3RyaW5nKGNvbmZpZywg InBhc3N0aHJvdWdoIiwgJmJ1ZiwgMCkpIHsKLSAgICAgICAgY19pbmZvLT5wYXNzdGhyb3VnaCA9 Ci0gICAgICAgICAgICAoZF9jb25maWctPm51bV9wY2lkZXZzIHx8IGRfY29uZmlnLT5udW1fZHRk ZXZzKQotICAgICAgICAgICAgPyBMSUJYTF9QQVNTVEhST1VHSF9VTktOT1dOIDogTElCWExfUEFT U1RIUk9VR0hfRElTQUJMRUQ7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgaWYgKCFzdHJjYXNlY21w KCJlbmFibGVkIiwgYnVmKSkKLSAgICAgICAgICAgIGNfaW5mby0+cGFzc3Rocm91Z2ggPSBMSUJY TF9QQVNTVEhST1VHSF9VTktOT1dOOwotICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgIGxpYnhs X3Bhc3N0aHJvdWdoIG87Ci0KLSAgICAgICAgICAgIGUgPSBsaWJ4bF9wYXNzdGhyb3VnaF9mcm9t X3N0cmluZyhidWYsICZvKTsKLSAgICAgICAgICAgIGlmIChlIHx8ICFzdHJjYXNlY21wKCJ1bmtu b3duIiwgYnVmKSkgewotICAgICAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLAotICAgICAgICAg ICAgICAgICAgICAgICAgIkVSUk9SOiB1bmtub3duIHBhc3N0aHJvdWdoIG9wdGlvbiAnJXMnXG4i LAotICAgICAgICAgICAgICAgICAgICAgICAgYnVmKTsKLSAgICAgICAgICAgICAgICBleGl0KC1F UlJPUl9GQUlMKTsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgY19pbmZvLT5wYXNzdGhy b3VnaCA9IG87Ci0gICAgICAgIH0KLSAgICB9Ci0KLSAgICBzd2l0Y2ggKGNfaW5mby0+cGFzc3Ro cm91Z2gpIHsKLSAgICBjYXNlIExJQlhMX1BBU1NUSFJPVUdIX1VOS05PV046Ci0gICAgICAgIC8q Ci0gICAgICAgICAqIENob29zZSBhIHN1aXRhYmxlIGRlZmF1bHQuIGxpYnhsIHdvdWxkIGFsc28g ZG8gdGhpcyBidXQKLSAgICAgICAgICogY2hvb3NpbmcgaGVyZSBhbGxvd3MgdGhlIGNvZGUgY2Fs Y3VsYXRpbmcgJ2lvbW11X21lbWtiJwotICAgICAgICAgKiBiZWxvdyBtYWtlIGFuIGluZm9ybWVk IGRlY2lzaW9uLgotICAgICAgICAgKi8KLSAgICAgICAgY19pbmZvLT5wYXNzdGhyb3VnaCA9Ci0g ICAgICAgICAgICAoY19pbmZvLT50eXBlID09IExJQlhMX0RPTUFJTl9UWVBFX1BWKSB8fCAhaW9t bXVfaGFwX3B0X3NoYXJlCi0gICAgICAgICAgICA/IExJQlhMX1BBU1NUSFJPVUdIX1NZTkNfUFQg OiBMSUJYTF9QQVNTVEhST1VHSF9TSEFSRV9QVDsKLSAgICAgICAgYnJlYWs7Ci0KLSAgICBjYXNl IExJQlhMX1BBU1NUSFJPVUdIX0RJU0FCTEVEOgotICAgICAgICBpZiAoZF9jb25maWctPm51bV9w Y2lkZXZzIHx8IGRfY29uZmlnLT5udW1fZHRkZXZzKSB7CisgICAgaWYgKCF4bHVfY2ZnX2dldF9z dHJpbmcoY29uZmlnLCAicGFzc3Rocm91Z2giLCAmYnVmLCAwKSkgeworICAgICAgICBpZiAobGli eGxfcGFzc3Rocm91Z2hfZnJvbV9zdHJpbmcoYnVmLCAmY19pbmZvLT5wYXNzdGhyb3VnaCkpIHsK ICAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLAotICAgICAgICAgICAgICAgICAgICAiRVJST1I6 IHBhc3N0aHJvdWdoIGRpc2FibGVkIGJ1dCBkZXZpY2VzIGFyZSBzcGVjaWZpZWRcbiIpOwotICAg ICAgICAgICAgZXhpdCgtRVJST1JfRkFJTCk7Ci0gICAgICAgIH0KLSAgICAgICAgYnJlYWs7Ci0g ICAgY2FzZSBMSUJYTF9QQVNTVEhST1VHSF9TSEFSRV9QVDoKLSAgICAgICAgaWYgKGNfaW5mby0+ dHlwZSA9PSBMSUJYTF9ET01BSU5fVFlQRV9QVikgewotICAgICAgICAgICAgZnByaW50ZihzdGRl cnIsCi0gICAgICAgICAgICAgICAgICAgICJFUlJPUjogcGFzc3Rocm91Z2g9XCJzaGFyZV9wdFwi IG5vdCB2YWxpZCBmb3IgUFYgZG9tYWluXG4iKTsKLSAgICAgICAgICAgIGV4aXQoLUVSUk9SX0ZB SUwpOwotICAgICAgICB9IGVsc2UgaWYgKCFpb21tdV9oYXBfcHRfc2hhcmUpIHsKLSAgICAgICAg ICAgIGZwcmludGYoc3RkZXJyLAotICAgICAgICAgICAgICAgICAgICAiRVJST1I6IHBhc3N0aHJv dWdoPVwic2hhcmVfcHRcIiBub3Qgc3VwcG9ydGVkIG9uIHRoaXMgcGxhdGZvcm1cbiIpOwotICAg ICAgICAgICAgZXhpdCgtRVJST1JfRkFJTCk7CisgICAgICAgICAgICAgICAgICAgICJFUlJPUjog dW5rbm93biBwYXNzdGhyb3VnaCBvcHRpb24gJyVzJ1xuIiwKKyAgICAgICAgICAgICAgICAgICAg YnVmKTsKKyAgICAgICAgICAgIGV4aXQoMSk7CiAgICAgICAgIH0KLSAgICAgICAgYnJlYWs7Ci0g ICAgY2FzZSBMSUJYTF9QQVNTVEhST1VHSF9TWU5DX1BUOgotICAgICAgICBicmVhazsKLSAgICB9 Ci0KLSAgICBpZiAoKGNfaW5mby0+cGFzc3Rocm91Z2ggIT0gTElCWExfUEFTU1RIUk9VR0hfRElT QUJMRUQpICYmCi0gICAgICAgICFpb21tdV9lbmFibGVkKSB7Ci0gICAgICAgIGZwcmludGYoc3Rk ZXJyLAotICAgICAgICAgICAgICAgICJFUlJPUjogcGFzc3Rocm91Z2ggbm90IHN1cHBvcnRlZCBv biB0aGlzIHBsYXRmb3JtXG4iKTsKLSAgICAgICAgZXhpdCgtRVJST1JfRkFJTCk7CiAgICAgfQog CiAgICAgaWYgKCF4bHVfY2ZnX2dldF9sb25nKGNvbmZpZywgInNoYWRvd19tZW1vcnkiLCAmbCwg MCkpCi0tIAoyLjExLjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0 Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRl dmVs