From: Wei Liu Subject: [PATCH for-next RFC 4/4] pygrub: make it build with python 3 Date: Tue, 5 Mar 2019 16:42:06 +0000 Message-ID: <20190305164206.6793-5-wei.liu2@citrix.com> References: <20190305164206.6793-1-wei.liu2@citrix.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] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1h1D91-0008Ls-BH for xen-devel@lists.xenproject.org; Tue, 05 Mar 2019 16:42:19 +0000 In-Reply-To: <20190305164206.6793-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 , Anthony PERARD , Ian Jackson , Wei Liu , Andrew Cooper List-Id: xen-devel@lists.xenproject.org V2l0aCB0aGUgaGVscCBvZiB0d28gcG9ydGluZyBndWlkZXMgYW5kIGNweXRob24gc291cmNlIGNv ZGU6CgoxLiBVc2UgUHlVbmljb2RlIHRvIHJlcGxhY2UgUHlTdHJpbmcgY291bnRlcnBhcnRzLgoy LiBVc2UgUHlWYXJPYmplY3RfSEVBRF9JTklUIGFuZCBwcm92aWRlIGNvbXBhdGliaWxpdHkgZm9y IDIuNSBhbmQKICAgZWFybGllci4KMy4gUmVtb3ZlIHVzYWdlIG9mIFB5X0ZpbmRNZXRob2QuCjQu IFVzZSBuZXcgbW9kdWxlIGluaXRpYWxpc2F0aW9uIHJvdXRpbmUuCgpGb3IgIzMsIFB5X0ZpbmRN ZXRob2Qgd2FzIHJlbW92ZWQsIHlldCBhbiBhbHRlcm5hdGl2ZSB3YXNuJ3QKZG9jdW1lbnRlZC4g IFRoZSBjb2RlIGlzIHRoZSByZXN1bHQgb2YgcmV2ZXJzZS1lbmdpbmVlcmluZyBjcHl0aG9uCmNv bW1pdCA2MTE2ZDRhMWQxCgpodHRwczovL2RvY3MucHl0aG9uLm9yZy8zL2hvd3RvL2Nwb3J0aW5n Lmh0bWwKaHR0cDovL3B5dGhvbjNwb3J0aW5nLmNvbS9jZXh0ZW5zaW9ucy5odG1sCgpTaWduZWQt b2ZmLWJ5OiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgotLS0KWFhYIEJ1aWxkIHRlc3Qg b25seSEKLS0tCiB0b29scy9weWdydWIvc3JjL2ZzaW1hZ2UvZnNpbWFnZS5jIHwgOTIgKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA4NCBpbnNl cnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rvb2xzL3B5Z3J1Yi9zcmMv ZnNpbWFnZS9mc2ltYWdlLmMgYi90b29scy9weWdydWIvc3JjL2ZzaW1hZ2UvZnNpbWFnZS5jCmlu ZGV4IDc0M2EzZmI3YjguLmM5MTQyNTM3NDEgMTAwNjQ0Ci0tLSBhL3Rvb2xzL3B5Z3J1Yi9zcmMv ZnNpbWFnZS9mc2ltYWdlLmMKKysrIGIvdG9vbHMvcHlncnViL3NyYy9mc2ltYWdlL2ZzaW1hZ2Uu YwpAQCAtMjYsMTEgKzI2LDE1IEBACiAjaW5jbHVkZSA8eGVuZnNpbWFnZS5oPgogI2luY2x1ZGUg PHN0ZGxpYi5oPgogCisjaWYgUFlfTUFKT1JfVkVSU0lPTiA8IDMKICNpZiAoUFlUSE9OX0FQSV9W RVJTSU9OID49IDEwMTEpCiAjZGVmaW5lIFBZX1BBRCAwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCww TCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTAogI2Vsc2UKICNk ZWZpbmUgUFlfUEFEIDBMLDBMLDBMLDBMCiAjZW5kaWYKKyNlbHNlCisjZGVmaW5lIFBZX1BBRCAw TCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTAorI2VuZGlm CiAKIHR5cGVkZWYgc3RydWN0IGZzaW1hZ2VfZnMgewogCVB5T2JqZWN0X0hFQUQKQEAgLTY2LDEy ICs3MCwyNCBAQCBmc2ltYWdlX2ZpbGVfcmVhZChmc2ltYWdlX2ZpbGVfdCAqZmlsZSwgUHlPYmpl Y3QgKmFyZ3MsIFB5T2JqZWN0ICprd2FyZ3MpCiAKIAlidWZzaXplID0gc2l6ZSA/IHNpemUgOiA0 MDk2OwogCi0JaWYgKChidWZmZXIgPSBQeVN0cmluZ19Gcm9tU3RyaW5nQW5kU2l6ZShOVUxMLCBi dWZzaXplKSkgPT0gTlVMTCkKKwlidWZmZXIgPQorI2lmIFBZX01BSk9SX1ZFUlNJT04gPCAzCisJ CVB5U3RyaW5nX0Zyb21TdHJpbmdBbmRTaXplKE5VTEwsIGJ1ZnNpemUpOworI2Vsc2UKKwkJUHlV bmljb2RlX0Zyb21TdHJpbmdBbmRTaXplKE5VTEwsIGJ1ZnNpemUpOworI2VuZGlmCisKKwlpZiAo YnVmZmVyID09IE5VTEwpCiAJCXJldHVybiAoTlVMTCk7CiAgCiAJd2hpbGUgKDEpIHsKIAkJaW50 IGVycjsKLQkJdm9pZCAqYnVmID0gUHlTdHJpbmdfQVNfU1RSSU5HKGJ1ZmZlcikgKyBieXRlc3Jl YWQ7CisJCXZvaWQgKmJ1ZiA9CisjaWYgUFlfTUFKT1JfVkVSU0lPTiA8IDMKKwkJCVB5U3RyaW5n X0FTX1NUUklORyhidWZmZXIpICsgYnl0ZXNyZWFkOworI2Vsc2UKKwkJCVB5VW5pY29kZV9BU19V TklDT0RFKGJ1ZmZlcikgKyBieXRlc3JlYWQ7CisjZW5kaWYKIAogCQllcnIgPSBmc2lfcHJlYWRf ZmlsZShmaWxlLT5maWxlLCBidWYsIGJ1ZnNpemUsCiAJCSAgICBieXRlc3JlYWQgKyBvZmZzZXQp OwpAQCAtOTEsMTIgKzEwNywyMCBAQCBmc2ltYWdlX2ZpbGVfcmVhZChmc2ltYWdlX2ZpbGVfdCAq ZmlsZSwgUHlPYmplY3QgKmFyZ3MsIFB5T2JqZWN0ICprd2FyZ3MpCiAJCQlpZiAoYnVmc2l6ZSA9 PSAwKQogCQkJCWJyZWFrOwogCQl9IGVsc2UgeworI2lmIFBZX01BSk9SX1ZFUlNJT04gPCAzCiAJ CQlpZiAoX1B5U3RyaW5nX1Jlc2l6ZSgmYnVmZmVyLCBieXRlc3JlYWQgKyBidWZzaXplKSA8IDAp CisjZWxzZQorCQkJaWYgKFB5VW5pY29kZV9SZXNpemUoJmJ1ZmZlciwgYnl0ZXNyZWFkICsgYnVm c2l6ZSkgPCAwKQorI2VuZGlmCiAJCQkJcmV0dXJuIChOVUxMKTsKIAkJfQogCX0KIAorI2lmIFBZ X01BSk9SX1ZFUlNJT04gPCAzCiAJX1B5U3RyaW5nX1Jlc2l6ZSgmYnVmZmVyLCBieXRlc3JlYWQp OworI2Vsc2UKKwlQeVVuaWNvZGVfUmVzaXplKCZidWZmZXIsIGJ5dGVzcmVhZCk7CisjZW5kaWYK IAlyZXR1cm4gKGJ1ZmZlcik7CiB9CiAKQEAgLTExMywxMSArMTM3LDEzIEBAIHN0YXRpYyBzdHJ1 Y3QgUHlNZXRob2REZWYgZnNpbWFnZV9maWxlX21ldGhvZHNbXSA9IHsKIAl7IE5VTEwsIE5VTEws IDAsIE5VTEwgfQkKIH07CiAKKyNpZiBQWV9NQUpPUl9WRVJTSU9OIDwgMwogc3RhdGljIFB5T2Jq ZWN0ICoKIGZzaW1hZ2VfZmlsZV9nZXRhdHRyKGZzaW1hZ2VfZmlsZV90ICpmaWxlLCBjaGFyICpu YW1lKQogewogCXJldHVybiAoUHlfRmluZE1ldGhvZChmc2ltYWdlX2ZpbGVfbWV0aG9kcywgKFB5 T2JqZWN0ICopZmlsZSwgbmFtZSkpOwogfQorI2VuZGlmCiAKIHN0YXRpYyB2b2lkCiBmc2ltYWdl X2ZpbGVfZGVhbGxvYyhmc2ltYWdlX2ZpbGVfdCAqZmlsZSkKQEAgLTEyOCwxNiArMTU0LDI1IEBA IGZzaW1hZ2VfZmlsZV9kZWFsbG9jKGZzaW1hZ2VfZmlsZV90ICpmaWxlKQogCVB5T2JqZWN0X0RF TChmaWxlKTsKIH0KIAorLyogQ29tcGF0aWJpbGl0eSBmb3IgMi41IGFuZCBlYXJsaWVyICovCisj aWZuZGVmIFB5VmFyT2JqZWN0X0hFQURfSU5JVAorI2RlZmluZSBQeVZhck9iamVjdF9IRUFEX0lO SVQodHlwZSwgc2l6ZSkgXAorCVB5T2JqZWN0X0hFQURfSU5JVCh0eXBlKSBzaXplLAorI2VuZGlm CisKIHN0YXRpYyBjaGFyIGZzaW1hZ2VfZmlsZV90eXBlX19kb2NfX1tdID0gIkZpbGVzeXN0ZW0g aW1hZ2UgZmlsZSI7CiBQeVR5cGVPYmplY3QgZnNpbWFnZV9maWxlX3R5cGUgPSB7Ci0JUHlPYmpl Y3RfSEVBRF9JTklUKCZQeVR5cGVfVHlwZSkKLQkwLAkJCQkJLyogb2Jfc2l6ZSAqLworCVB5VmFy T2JqZWN0X0hFQURfSU5JVCgmUHlUeXBlX1R5cGUsIDApCiAJInhlbmZzaW1hZ2UuZmlsZSIsCQkJ LyogdHBfbmFtZSAqLwogCXNpemVvZihmc2ltYWdlX2ZpbGVfdCksCQkJLyogdHBfc2l6ZSAqLwog CTAsCQkJCQkvKiB0cF9pdGVtc2l6ZSAqLwogCShkZXN0cnVjdG9yKSBmc2ltYWdlX2ZpbGVfZGVh bGxvYywgCS8qIHRwX2RlYWxsb2MgKi8KIAkwLAkJCQkJLyogdHBfcHJpbnQgKi8KKyNpZiBQWV9N QUpPUl9WRVJTSU9OIDwgMwogCShnZXRhdHRyZnVuYykgZnNpbWFnZV9maWxlX2dldGF0dHIsIAkv KiB0cF9nZXRhdHRyICovCisjZWxzZQorCTAsCQkJCQkvKiB0cF9nZXRhdHRyICovCisjZW5kaWYK IAkwLAkJCQkJLyogdHBfc2V0YXR0ciAqLwogCTAsCQkJCQkvKiB0cF9jb21wYXJlICovCiAJMCwJ CQkJCS8qIHRwX3JlcHIgKi8KQEAgLTE1MSw3ICsxODYsMTYgQEAgUHlUeXBlT2JqZWN0IGZzaW1h Z2VfZmlsZV90eXBlID0gewogCTAsCQkJCQkvKiB0cF9zZXRhdHRybyAqLwogCTAsCQkJCQkvKiB0 cF9hc19idWZmZXIgKi8KIAlQeV9UUEZMQUdTX0RFRkFVTFQsCQkJLyogdHBfZmxhZ3MgKi8KLQlm c2ltYWdlX2ZpbGVfdHlwZV9fZG9jX18sCisJZnNpbWFnZV9maWxlX3R5cGVfX2RvY19fLAkJLyog dHBfZG9jICovCisjaWYgUFlfTUFKT1JfVkVSU0lPTiA+PSAzCisJMCwJCQkJCS8qIHRwX3RyYXZl cnNlICovCisJMCwJCQkJCS8qIHRwX2NsZWFyICovCisJMCwJCQkJCS8qIHRwX3JpY2hjb21wYXJl ICovCisJMCwJCQkJCS8qIHRwX3dlYWtsaXN0b2Zmc2V0ICovCisJMCwJCQkJCS8qIHRwX2l0ZXIg Ki8KKwkwLAkJCQkJLyogdHBfaXRlcm5leHQgKi8KKwlmc2ltYWdlX2ZpbGVfbWV0aG9kcywJCQkv KiB0cF9tZXRob2RzICovCisjZW5kaWYKIAlQWV9QQUQKIH07CiAKQEAgLTIxNSwxMSArMjU5LDEz IEBAIHN0YXRpYyBzdHJ1Y3QgUHlNZXRob2REZWYgZnNpbWFnZV9mc19tZXRob2RzW10gPSB7CiAJ eyBOVUxMLCBOVUxMLCAwLCBOVUxMIH0JCiB9OwogCisjaWYgUFlfTUFKT1JfVkVSU0lPTiA8IDMK IHN0YXRpYyBQeU9iamVjdCAqCiBmc2ltYWdlX2ZzX2dldGF0dHIoZnNpbWFnZV9mc190ICpmcywg Y2hhciAqbmFtZSkKIHsKIAlyZXR1cm4gKFB5X0ZpbmRNZXRob2QoZnNpbWFnZV9mc19tZXRob2Rz LCAoUHlPYmplY3QgKilmcywgbmFtZSkpOwogfQorI2VuZGlmCiAKIHN0YXRpYyB2b2lkCiBmc2lt YWdlX2ZzX2RlYWxsb2MgKGZzaW1hZ2VfZnNfdCAqZnMpCkBAIC0yMzIsMTQgKzI3OCwxNyBAQCBm c2ltYWdlX2ZzX2RlYWxsb2MgKGZzaW1hZ2VfZnNfdCAqZnMpCiBQeURvY19TVFJWQVIoZnNpbWFn ZV9mc190eXBlX19kb2NfXywgIkZpbGVzeXN0ZW0gaW1hZ2UiKTsKIAogUHlUeXBlT2JqZWN0IGZz aW1hZ2VfZnNfdHlwZSA9IHsKLQlQeU9iamVjdF9IRUFEX0lOSVQoJlB5VHlwZV9UeXBlKQotCTAs CQkJCQkvKiBvYl9zaXplICovCisJUHlWYXJPYmplY3RfSEVBRF9JTklUKCZQeVR5cGVfVHlwZSwg MCkKIAkieGVuZnNpbWFnZS5mcyIsCQkJLyogdHBfbmFtZSAqLwogCXNpemVvZihmc2ltYWdlX2Zz X3QpLAkJCS8qIHRwX3NpemUgKi8KIAkwLAkJCQkJLyogdHBfaXRlbXNpemUgKi8KIAkoZGVzdHJ1 Y3RvcikgZnNpbWFnZV9mc19kZWFsbG9jLCAJLyogdHBfZGVhbGxvYyAqLwogCTAsCQkJCQkvKiB0 cF9wcmludCAqLworI2lmIFBZX01BSk9SX1ZFUlNJT04gPCAzCiAJKGdldGF0dHJmdW5jKSBmc2lt YWdlX2ZzX2dldGF0dHIsIAkvKiB0cF9nZXRhdHRyICovCisjZWxzZQorCTAsCQkJCQkvKiB0cF9n ZXRhdHRyICovCisjZW5kaWYKIAkwLAkJCQkJLyogdHBfc2V0YXR0ciAqLwogCTAsCQkJCQkvKiB0 cF9jb21wYXJlICovCiAJMCwJCQkJCS8qIHRwX3JlcHIgKi8KQEAgLTI1Myw3ICszMDIsMTYgQEAg UHlUeXBlT2JqZWN0IGZzaW1hZ2VfZnNfdHlwZSA9IHsKIAkwLAkJCQkJLyogdHBfc2V0YXR0cm8g Ki8KIAkwLAkJCQkJLyogdHBfYXNfYnVmZmVyICovCiAJUHlfVFBGTEFHU19ERUZBVUxULAkJCS8q IHRwX2ZsYWdzICovCi0JZnNpbWFnZV9mc190eXBlX19kb2NfXywKKwlmc2ltYWdlX2ZzX3R5cGVf X2RvY19fLAkJCS8qIHRwX2RvYyAqLworI2lmIFBZX01BSk9SX1ZFUlNJT04gPj0gMworCTAsCQkJ CQkvKiB0cF90cmF2ZXJzZSAqLworCTAsCQkJCQkvKiB0cF9jbGVhciAqLworCTAsCQkJCQkvKiB0 cF9yaWNoY29tcGFyZSAqLworCTAsCQkJCQkvKiB0cF93ZWFrbGlzdG9mZnNldCAqLworCTAsCQkJ CQkvKiB0cF9pdGVyICovCisJMCwJCQkJCS8qIHRwX2l0ZXJuZXh0ICovCisJZnNpbWFnZV9mc19t ZXRob2RzLAkJCS8qIHRwX21ldGhvZHMgKi8KKyNlbmRpZgogCVBZX1BBRAogfTsKIApAQCAtMzE2 LDggKzM3NCwyNiBAQCBzdGF0aWMgc3RydWN0IFB5TWV0aG9kRGVmIGZzaW1hZ2VfbW9kdWxlX21l dGhvZHNbXSA9IHsKIAl7IE5VTEwsIE5VTEwsIDAsIE5VTEwgfQogfTsKIAorI2lmIFBZX01BSk9S X1ZFUlNJT04gPj0gMworc3RhdGljIHN0cnVjdCBQeU1vZHVsZURlZiBmc2ltYWdlX21vZHVsZV9k ZWYgPSB7CisJUHlNb2R1bGVEZWZfSEVBRF9JTklULAorCSJ4ZW5mc2ltYWdlIiwJCS8qIG1fbmFt ZSAqLworCSIiLAkJCS8qIG1fZG9jICovCisJLTEsCQkJLyogbV9zaXplICovCisJZnNpbWFnZV9t b2R1bGVfbWV0aG9kcywJLyogbV9tZXRob2RzICovCisJTlVMTCwJCQkvKiBtX3JlbG9hZCAqLwor CU5VTEwsCQkJLyogbV90cmF2ZXJzZSAqLworCU5VTEwsCQkJLyogbV9jbGVhciAqLworCU5VTEwJ CQkvKiBtX2ZyZWUgKi8KK307CisjZW5kaWYKKwogUHlNT0RJTklUX0ZVTkMKIGluaXR4ZW5mc2lt YWdlKHZvaWQpCiB7CisjaWYgUFlfTUFKT1JfVkVSU0lPTiA8IDMKIAlQeV9Jbml0TW9kdWxlKCJ4 ZW5mc2ltYWdlIiwgZnNpbWFnZV9tb2R1bGVfbWV0aG9kcyk7CisjZWxzZQorCXJldHVybiBQeU1v ZHVsZV9DcmVhdGUoJmZzaW1hZ2VfbW9kdWxlX2RlZik7CisjZW5kaWYKIH0KLS0gCjIuMTEuMAoK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZl bCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlz dHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=