From: Wei Liu Subject: [PATCH v4 5/8] libxl: make python scripts work with python 2.6 and up Date: Mon, 11 Mar 2019 18:01:34 +0000 Message-ID: <20190311180137.7805-6-wei.liu2@citrix.com> References: <20190311180137.7805-1-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1h3PFE-0000X1-Sb for xen-devel@lists.xenproject.org; Mon, 11 Mar 2019 18:01:48 +0000 In-Reply-To: <20190311180137.7805-1-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: George Dunlap , Andrew Cooper , Wei Liu , Ian Jackson , Anthony PERARD List-Id: xen-devel@lists.xenproject.org R28gdGhyb3VnaCB0cmFuc2Zvcm1hdGlvbnMgc3VnZ2VzdGVkIGJ5IDJ0bzMgYW5kIHBpY2sgdGhl IG5lY2Vzc2FyeQpvbmVzLgoKU2lnbmVkLW9mZi1ieTogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4 LmNvbT4KUmV2aWV3ZWQtYnk6IEFuZHJldyBDb29wZXIgPGFuZHJldy5jb29wZXIzQGNpdHJpeC5j b20+Ci0tLQogdG9vbHMvbGlieGwvZ2VudGVzdC5weSAgfCAgNCArKystCiB0b29scy9saWJ4bC9n ZW50eXBlcy5weSB8IDEyICsrKysrKystLS0tLQogdG9vbHMvbGlieGwvaWRsLnB5ICAgICAgfCAx NSArKysrKysrKy0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTggaW5zZXJ0aW9ucygrKSwgMTMg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwvZ2VudGVzdC5weSBiL3Rvb2xz L2xpYnhsL2dlbnRlc3QucHkKaW5kZXggOTg5OTU5ZmM2OC4uMWNjN2VlYmM4MiAxMDA2NDQKLS0t IGEvdG9vbHMvbGlieGwvZ2VudGVzdC5weQorKysgYi90b29scy9saWJ4bC9nZW50ZXN0LnB5CkBA IC0xLDUgKzEsNyBAQAogIyEvdXNyL2Jpbi9weXRob24KIAorZnJvbSBfX2Z1dHVyZV9fIGltcG9y dCBwcmludF9mdW5jdGlvbgorCiBpbXBvcnQgb3MKIGltcG9ydCBzeXMKIGltcG9ydCByZQpAQCAt ODYsNyArODgsNyBAQCBkZWYgZ2VuX3JhbmRfaW5pdCh0eSwgdiwgaW5kZW50ID0gIiAgICAiLCBw YXJlbnQgPSBOb25lKToKIAogaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKICAgICBpZiBsZW4o c3lzLmFyZ3YpIDwgMzoKLSAgICAgICAgcHJpbnQgPj5zeXMuc3RkZXJyLCAiVXNhZ2U6IGdlbnRl c3QucHkgPGlkbD4gPGltcGxlbWVudGF0aW9uPiIKKyAgICAgICAgcHJpbnQoIlVzYWdlOiBnZW50 ZXN0LnB5IDxpZGw+IDxpbXBsZW1lbnRhdGlvbj4iLCBmaWxlPXN5cy5zdGRlcnIpCiAgICAgICAg IHN5cy5leGl0KDEpCiAKICAgICByYW5kb20uc2VlZChvcy5nZXRlbnYoJ0xJQlhMX1RFU1RJRExf U0VFRCcpKQpkaWZmIC0tZ2l0IGEvdG9vbHMvbGlieGwvZ2VudHlwZXMucHkgYi90b29scy9saWJ4 bC9nZW50eXBlcy5weQppbmRleCA4OGU1YzVmMzBlLi42NDE3YzlkZDhjIDEwMDY0NAotLS0gYS90 b29scy9saWJ4bC9nZW50eXBlcy5weQorKysgYi90b29scy9saWJ4bC9nZW50eXBlcy5weQpAQCAt MSw1ICsxLDcgQEAKICMhL3Vzci9iaW4vcHl0aG9uCiAKK2Zyb20gX19mdXR1cmVfXyBpbXBvcnQg cHJpbnRfZnVuY3Rpb24KKwogaW1wb3J0IHN5cwogaW1wb3J0IHJlCiAKQEAgLTU3NiwxNCArNTc4 LDE0IEBAIGRlZiBsaWJ4bF9DX2VudW1fZnJvbV9zdHJpbmcodHksIHN0ciwgZSwgaW5kZW50ID0g IiAgICAiKToKIAogaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKICAgICBpZiBsZW4oc3lzLmFy Z3YpICE9IDY6Ci0gICAgICAgIHByaW50ID4+c3lzLnN0ZGVyciwgIlVzYWdlOiBnZW50eXBlcy5w eSA8aWRsPiA8aGVhZGVyPiA8aGVhZGVyLXByaXZhdGU+IDxoZWFkZXItanNvbj4gPGltcGxlbWVu dGF0aW9uPiIKKyAgICAgICAgcHJpbnQoIlVzYWdlOiBnZW50eXBlcy5weSA8aWRsPiA8aGVhZGVy PiA8aGVhZGVyLXByaXZhdGU+IDxoZWFkZXItanNvbj4gPGltcGxlbWVudGF0aW9uPiIsIGZpbGU9 c3lzLnN0ZGVycikKICAgICAgICAgc3lzLmV4aXQoMSkKIAogICAgIChfLCBpZGxuYW1lLCBoZWFk ZXIsIGhlYWRlcl9wcml2YXRlLCBoZWFkZXJfanNvbiwgaW1wbCkgPSBzeXMuYXJndgogCiAgICAg KGJ1aWx0aW5zLHR5cGVzKSA9IGlkbC5wYXJzZShpZGxuYW1lKQogCi0gICAgcHJpbnQgIm91dHB1 dHRpbmcgbGlieGwgdHlwZSBkZWZpbml0aW9ucyB0byAlcyIgJSBoZWFkZXIKKyAgICBwcmludCgi b3V0cHV0dGluZyBsaWJ4bCB0eXBlIGRlZmluaXRpb25zIHRvICVzIiAlIGhlYWRlcikKIAogICAg IGYgPSBvcGVuKGhlYWRlciwgInciKQogCkBAIC02MzMsNyArNjM1LDcgQEAgaWYgX19uYW1lX18g PT0gJ19fbWFpbl9fJzoKICAgICBmLndyaXRlKCIiIiNlbmRpZiAvKiAlcyAqL1xuIiIiICUgKGhl YWRlcl9kZWZpbmUpKQogICAgIGYuY2xvc2UoKQogCi0gICAgcHJpbnQgIm91dHB1dHRpbmcgbGli eGwgSlNPTiBkZWZpbml0aW9ucyB0byAlcyIgJSBoZWFkZXJfanNvbgorICAgIHByaW50KCJvdXRw dXR0aW5nIGxpYnhsIEpTT04gZGVmaW5pdGlvbnMgdG8gJXMiICUgaGVhZGVyX2pzb24pCiAKICAg ICBmID0gb3BlbihoZWFkZXJfanNvbiwgInciKQogCkBAIC02NTcsNyArNjU5LDcgQEAgaWYgX19u YW1lX18gPT0gJ19fbWFpbl9fJzoKICAgICBmLndyaXRlKCIiIiNlbmRpZiAvKiAlcyAqL1xuIiIi ICUgaGVhZGVyX2pzb25fZGVmaW5lKQogICAgIGYuY2xvc2UoKQogCi0gICAgcHJpbnQgIm91dHB1 dHRpbmcgbGlieGwgdHlwZSBpbnRlcm5hbCBkZWZpbml0aW9ucyB0byAlcyIgJSBoZWFkZXJfcHJp dmF0ZQorICAgIHByaW50KCJvdXRwdXR0aW5nIGxpYnhsIHR5cGUgaW50ZXJuYWwgZGVmaW5pdGlv bnMgdG8gJXMiICUgaGVhZGVyX3ByaXZhdGUpCiAKICAgICBmID0gb3BlbihoZWFkZXJfcHJpdmF0 ZSwgInciKQogCkBAIC02ODMsNyArNjg1LDcgQEAgaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoK ICAgICBmLndyaXRlKCIiIiNlbmRpZiAvKiAlcyAqL1xuIiIiICUgaGVhZGVyX2pzb25fZGVmaW5l KQogICAgIGYuY2xvc2UoKQogCi0gICAgcHJpbnQgIm91dHB1dHRpbmcgbGlieGwgdHlwZSBpbXBs ZW1lbnRhdGlvbnMgdG8gJXMiICUgaW1wbAorICAgIHByaW50KCJvdXRwdXR0aW5nIGxpYnhsIHR5 cGUgaW1wbGVtZW50YXRpb25zIHRvICVzIiAlIGltcGwpCiAKICAgICBmID0gb3BlbihpbXBsLCAi dyIpCiAgICAgZi53cml0ZSgiIiIKZGlmZiAtLWdpdCBhL3Rvb2xzL2xpYnhsL2lkbC5weSBiL3Rv b2xzL2xpYnhsL2lkbC5weQppbmRleCAyYTdmM2M0NGZlLi5kNzM2NzUwM2I0IDEwMDY0NAotLS0g YS90b29scy9saWJ4bC9pZGwucHkKKysrIGIvdG9vbHMvbGlieGwvaWRsLnB5CkBAIC0xLDMgKzEs NSBAQAorZnJvbSBfX2Z1dHVyZV9fIGltcG9ydCBwcmludF9mdW5jdGlvbgorCiBpbXBvcnQgc3lz CiAKIFBBU1NfQllfVkFMVUUgPSAxCkBAIC0xMSw3ICsxMyw3IEBAIERJUl9CT1RIID0gMwogX2Rl ZmF1bHRfbmFtZXNwYWNlID0gIiIKIGRlZiBuYW1lc3BhY2Uocyk6CiAgICAgaWYgdHlwZShzKSAh PSBzdHI6Ci0gICAgICAgIHJhaXNlIFR5cGVFcnJvciwgIlJlcXVpcmUgYSBzdHJpbmcgZm9yIHRo ZSBkZWZhdWx0IG5hbWVzcGFjZS4iCisgICAgICAgIHJhaXNlIFR5cGVFcnJvcigiUmVxdWlyZSBh IHN0cmluZyBmb3IgdGhlIGRlZmF1bHQgbmFtZXNwYWNlLiIpCiAgICAgZ2xvYmFsIF9kZWZhdWx0 X25hbWVzcGFjZQogICAgIF9kZWZhdWx0X25hbWVzcGFjZSA9IHMKIApAQCAtMzQ2LDcgKzM0OCw3 IEBAIGNsYXNzIE9yZGVyZWREaWN0KGRpY3QpOgogICAgICAgICByZXR1cm4gWyh4LHNlbGZbeF0p IGZvciB4IGluIHNlbGYuX19vcmRlcmVkXQogCiBkZWYgcGFyc2UoZik6Ci0gICAgcHJpbnQgPj5z eXMuc3RkZXJyLCAiUGFyc2luZyAlcyIgJSBmCisgICAgcHJpbnQoIlBhcnNpbmcgJXMiICUgZiwg ZmlsZT1zeXMuc3RkZXJyKQogCiAgICAgZ2xvYnMgPSB7fQogICAgIGxvY3MgPSBPcmRlcmVkRGlj dCgpCkBAIC0zNjIsMTEgKzM2NCwxMCBAQCBkZWYgcGFyc2UoZik6CiAgICAgICAgICAgICBnbG9i c1tuXSA9IHQKIAogICAgIHRyeToKLSAgICAgICAgZXhlY2ZpbGUoZiwgZ2xvYnMsIGxvY3MpCi0g ICAgZXhjZXB0IFN5bnRheEVycm9yLGU6Ci0gICAgICAgIHJhaXNlIFN5bnRheEVycm9yLCBcCi0g ICAgICAgICAgICAgICJFcnJvcnMgd2VyZSBmb3VuZCBhdCBsaW5lICVkIHdoaWxlIHByb2Nlc3Np bmcgJXM6XG5cdCVzIlwKLSAgICAgICAgICAgICAgJShlLmxpbmVubyxmLGUudGV4dCkKKyAgICAg ICAgZXhlYyhjb21waWxlKG9wZW4oZikucmVhZCgpLCBmLCAnZXhlYycpLCBnbG9icywgbG9jcykK KyAgICBleGNlcHQgU3ludGF4RXJyb3IgYXMgZToKKyAgICAgICAgcmFpc2UgU3ludGF4RXJyb3Io IkVycm9ycyB3ZXJlIGZvdW5kIGF0IGxpbmUgJWQgd2hpbGUgcHJvY2Vzc2luZyAlczpcblx0JXMi CisgICAgICAgICAgICAgICAgICAgICAgICAgICUgKGUubGluZW5vLCBmLCBlLnRleHQpKQogCiAg ICAgdHlwZXMgPSBbdCBmb3IgdCBpbiBsb2NzLm9yZGVyZWRfdmFsdWVzKCkgaWYgaXNpbnN0YW5j ZSh0LFR5cGUpXQogCi0tIAoyLjExLjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54 ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGlu Zm8veGVuLWRldmVs