From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH for-next v2 v2 4/5] pygrub: make it build with python 3 Date: Wed, 6 Mar 2019 17:52:09 +0000 Message-ID: <20190306175210.28145-5-wei.liu2@citrix.com> References: <20190306175210.28145-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 1h1aiT-0000Xk-63 for xen-devel@lists.xenproject.org; Wed, 06 Mar 2019 17:52:29 +0000 In-Reply-To: <20190306175210.28145-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 , Wei Liu , Ian Jackson , Andrew Cooper List-Id: xen-devel@lists.xenproject.org V2l0aCB0aGUgaGVscCBvZiB0d28gcG9ydGluZyBndWlkZXMgYW5kIGNweXRob24gc291cmNlIGNv ZGU6CgoxLiBVc2UgUHlCeXRlcyB0byByZXBsYWNlIFB5U3RyaW5nIGNvdW50ZXJwYXJ0cy4KMi4g VXNlIFB5VmFyT2JqZWN0X0hFQURfSU5JVCBhbmQgcHJvdmlkZSBjb21wYXRpYmlsaXR5IGZvciAy LjUgYW5kCiAgIGVhcmxpZXIuCjMuIFJlbW92ZSB1c2FnZSBvZiBQeV9GaW5kTWV0aG9kLgo0LiBV c2UgbmV3IG1vZHVsZSBpbml0aWFsaXNhdGlvbiByb3V0aW5lLgoKRm9yICMzLCBQeV9GaW5kTWV0 aG9kIHdhcyByZW1vdmVkLCB5ZXQgYW4gYWx0ZXJuYXRpdmUgd2Fzbid0CmRvY3VtZW50ZWQuICBU aGUgY29kZSBpcyB0aGUgcmVzdWx0IG9mIHJldmVyc2UtZW5naW5lZXJpbmcgY3B5dGhvbgpjb21t aXQgNjExNmQ0YTFkMQoKaHR0cHM6Ly9kb2NzLnB5dGhvbi5vcmcvMy9ob3d0by9jcG9ydGluZy5o dG1sCmh0dHA6Ly9weXRob24zcG9ydGluZy5jb20vY2V4dGVuc2lvbnMuaHRtbAoKU2lnbmVkLW9m Zi1ieTogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KLS0tCnYyOiB1c2UgUHlCeXRlcy4K LS0tCiB0b29scy9weWdydWIvc3JjL2ZzaW1hZ2UvZnNpbWFnZS5jIHwgOTYgKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKy0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA4OCBpbnNlcnRpb25z KCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rvb2xzL3B5Z3J1Yi9zcmMvZnNpbWFn ZS9mc2ltYWdlLmMgYi90b29scy9weWdydWIvc3JjL2ZzaW1hZ2UvZnNpbWFnZS5jCmluZGV4IDc0 M2EzZmI3YjguLjdlMTI0ZjdiYjMgMTAwNjQ0Ci0tLSBhL3Rvb2xzL3B5Z3J1Yi9zcmMvZnNpbWFn ZS9mc2ltYWdlLmMKKysrIGIvdG9vbHMvcHlncnViL3NyYy9mc2ltYWdlL2ZzaW1hZ2UuYwpAQCAt MjYsMTEgKzI2LDE1IEBACiAjaW5jbHVkZSA8eGVuZnNpbWFnZS5oPgogI2luY2x1ZGUgPHN0ZGxp Yi5oPgogCisjaWYgUFlfTUFKT1JfVkVSU0lPTiA8IDMKICNpZiAoUFlUSE9OX0FQSV9WRVJTSU9O ID49IDEwMTEpCiAjZGVmaW5lIFBZX1BBRCAwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCww TCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTAogI2Vsc2UKICNkZWZpbmUg UFlfUEFEIDBMLDBMLDBMLDBMCiAjZW5kaWYKKyNlbHNlCisjZGVmaW5lIFBZX1BBRCAwTCwwTCww TCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTCwwTAorI2VuZGlmCiAKIHR5 cGVkZWYgc3RydWN0IGZzaW1hZ2VfZnMgewogCVB5T2JqZWN0X0hFQUQKQEAgLTY2LDEyICs3MCwy NCBAQCBmc2ltYWdlX2ZpbGVfcmVhZChmc2ltYWdlX2ZpbGVfdCAqZmlsZSwgUHlPYmplY3QgKmFy Z3MsIFB5T2JqZWN0ICprd2FyZ3MpCiAKIAlidWZzaXplID0gc2l6ZSA/IHNpemUgOiA0MDk2Owog Ci0JaWYgKChidWZmZXIgPSBQeVN0cmluZ19Gcm9tU3RyaW5nQW5kU2l6ZShOVUxMLCBidWZzaXpl KSkgPT0gTlVMTCkKKwlidWZmZXIgPQorI2lmIFBZX01BSk9SX1ZFUlNJT04gPCAzCisJCVB5U3Ry aW5nX0Zyb21TdHJpbmdBbmRTaXplKE5VTEwsIGJ1ZnNpemUpOworI2Vsc2UKKwkJUHlCeXRlc19G cm9tU3RyaW5nQW5kU2l6ZShOVUxMLCBidWZzaXplKTsKKyNlbmRpZgorCisJaWYgKGJ1ZmZlciA9 PSBOVUxMKQogCQlyZXR1cm4gKE5VTEwpOwogIAogCXdoaWxlICgxKSB7CiAJCWludCBlcnI7Ci0J CXZvaWQgKmJ1ZiA9IFB5U3RyaW5nX0FTX1NUUklORyhidWZmZXIpICsgYnl0ZXNyZWFkOworCQl2 b2lkICpidWYgPQorI2lmIFBZX01BSk9SX1ZFUlNJT04gPCAzCisJCQlQeVN0cmluZ19BU19TVFJJ TkcoYnVmZmVyKSArIGJ5dGVzcmVhZDsKKyNlbHNlCisJCQlQeUJ5dGVzX0FTX1NUUklORyhidWZm ZXIpICsgYnl0ZXNyZWFkOworI2VuZGlmCiAKIAkJZXJyID0gZnNpX3ByZWFkX2ZpbGUoZmlsZS0+ ZmlsZSwgYnVmLCBidWZzaXplLAogCQkgICAgYnl0ZXNyZWFkICsgb2Zmc2V0KTsKQEAgLTkxLDEy ICsxMDcsMjAgQEAgZnNpbWFnZV9maWxlX3JlYWQoZnNpbWFnZV9maWxlX3QgKmZpbGUsIFB5T2Jq ZWN0ICphcmdzLCBQeU9iamVjdCAqa3dhcmdzKQogCQkJaWYgKGJ1ZnNpemUgPT0gMCkKIAkJCQli cmVhazsKIAkJfSBlbHNlIHsKKyNpZiBQWV9NQUpPUl9WRVJTSU9OIDwgMwogCQkJaWYgKF9QeVN0 cmluZ19SZXNpemUoJmJ1ZmZlciwgYnl0ZXNyZWFkICsgYnVmc2l6ZSkgPCAwKQorI2Vsc2UKKwkJ CWlmIChfUHlCeXRlc19SZXNpemUoJmJ1ZmZlciwgYnl0ZXNyZWFkICsgYnVmc2l6ZSkgPCAwKQor I2VuZGlmCiAJCQkJcmV0dXJuIChOVUxMKTsKIAkJfQogCX0KIAorI2lmIFBZX01BSk9SX1ZFUlNJ T04gPCAzCiAJX1B5U3RyaW5nX1Jlc2l6ZSgmYnVmZmVyLCBieXRlc3JlYWQpOworI2Vsc2UKKwlf UHlCeXRlc19SZXNpemUoJmJ1ZmZlciwgYnl0ZXNyZWFkKTsKKyNlbmRpZgogCXJldHVybiAoYnVm ZmVyKTsKIH0KIApAQCAtMTEzLDExICsxMzcsMTMgQEAgc3RhdGljIHN0cnVjdCBQeU1ldGhvZERl ZiBmc2ltYWdlX2ZpbGVfbWV0aG9kc1tdID0gewogCXsgTlVMTCwgTlVMTCwgMCwgTlVMTCB9CQog fTsKIAorI2lmIFBZX01BSk9SX1ZFUlNJT04gPCAzCiBzdGF0aWMgUHlPYmplY3QgKgogZnNpbWFn ZV9maWxlX2dldGF0dHIoZnNpbWFnZV9maWxlX3QgKmZpbGUsIGNoYXIgKm5hbWUpCiB7CiAJcmV0 dXJuIChQeV9GaW5kTWV0aG9kKGZzaW1hZ2VfZmlsZV9tZXRob2RzLCAoUHlPYmplY3QgKilmaWxl LCBuYW1lKSk7CiB9CisjZW5kaWYKIAogc3RhdGljIHZvaWQKIGZzaW1hZ2VfZmlsZV9kZWFsbG9j KGZzaW1hZ2VfZmlsZV90ICpmaWxlKQpAQCAtMTI4LDE2ICsxNTQsMjUgQEAgZnNpbWFnZV9maWxl X2RlYWxsb2MoZnNpbWFnZV9maWxlX3QgKmZpbGUpCiAJUHlPYmplY3RfREVMKGZpbGUpOwogfQog CisvKiBDb21wYXRpYmlsaXR5IGZvciAyLjUgYW5kIGVhcmxpZXIgKi8KKyNpZm5kZWYgUHlWYXJP YmplY3RfSEVBRF9JTklUCisjZGVmaW5lIFB5VmFyT2JqZWN0X0hFQURfSU5JVCh0eXBlLCBzaXpl KSBcCisJUHlPYmplY3RfSEVBRF9JTklUKHR5cGUpIHNpemUsCisjZW5kaWYKKwogc3RhdGljIGNo YXIgZnNpbWFnZV9maWxlX3R5cGVfX2RvY19fW10gPSAiRmlsZXN5c3RlbSBpbWFnZSBmaWxlIjsK IFB5VHlwZU9iamVjdCBmc2ltYWdlX2ZpbGVfdHlwZSA9IHsKLQlQeU9iamVjdF9IRUFEX0lOSVQo JlB5VHlwZV9UeXBlKQotCTAsCQkJCQkvKiBvYl9zaXplICovCisJUHlWYXJPYmplY3RfSEVBRF9J TklUKCZQeVR5cGVfVHlwZSwgMCkKIAkieGVuZnNpbWFnZS5maWxlIiwJCQkvKiB0cF9uYW1lICov CiAJc2l6ZW9mKGZzaW1hZ2VfZmlsZV90KSwJCQkvKiB0cF9zaXplICovCiAJMCwJCQkJCS8qIHRw X2l0ZW1zaXplICovCiAJKGRlc3RydWN0b3IpIGZzaW1hZ2VfZmlsZV9kZWFsbG9jLCAJLyogdHBf ZGVhbGxvYyAqLwogCTAsCQkJCQkvKiB0cF9wcmludCAqLworI2lmIFBZX01BSk9SX1ZFUlNJT04g PCAzCiAJKGdldGF0dHJmdW5jKSBmc2ltYWdlX2ZpbGVfZ2V0YXR0ciwgCS8qIHRwX2dldGF0dHIg Ki8KKyNlbHNlCisJMCwJCQkJCS8qIHRwX2dldGF0dHIgKi8KKyNlbmRpZgogCTAsCQkJCQkvKiB0 cF9zZXRhdHRyICovCiAJMCwJCQkJCS8qIHRwX2NvbXBhcmUgKi8KIAkwLAkJCQkJLyogdHBfcmVw ciAqLwpAQCAtMTUxLDcgKzE4NiwxNiBAQCBQeVR5cGVPYmplY3QgZnNpbWFnZV9maWxlX3R5cGUg PSB7CiAJMCwJCQkJCS8qIHRwX3NldGF0dHJvICovCiAJMCwJCQkJCS8qIHRwX2FzX2J1ZmZlciAq LwogCVB5X1RQRkxBR1NfREVGQVVMVCwJCQkvKiB0cF9mbGFncyAqLwotCWZzaW1hZ2VfZmlsZV90 eXBlX19kb2NfXywKKwlmc2ltYWdlX2ZpbGVfdHlwZV9fZG9jX18sCQkvKiB0cF9kb2MgKi8KKyNp ZiBQWV9NQUpPUl9WRVJTSU9OID49IDMKKwkwLAkJCQkJLyogdHBfdHJhdmVyc2UgKi8KKwkwLAkJ CQkJLyogdHBfY2xlYXIgKi8KKwkwLAkJCQkJLyogdHBfcmljaGNvbXBhcmUgKi8KKwkwLAkJCQkJ LyogdHBfd2Vha2xpc3RvZmZzZXQgKi8KKwkwLAkJCQkJLyogdHBfaXRlciAqLworCTAsCQkJCQkv KiB0cF9pdGVybmV4dCAqLworCWZzaW1hZ2VfZmlsZV9tZXRob2RzLAkJCS8qIHRwX21ldGhvZHMg Ki8KKyNlbmRpZgogCVBZX1BBRAogfTsKIApAQCAtMjE1LDExICsyNTksMTMgQEAgc3RhdGljIHN0 cnVjdCBQeU1ldGhvZERlZiBmc2ltYWdlX2ZzX21ldGhvZHNbXSA9IHsKIAl7IE5VTEwsIE5VTEws IDAsIE5VTEwgfQkKIH07CiAKKyNpZiBQWV9NQUpPUl9WRVJTSU9OIDwgMwogc3RhdGljIFB5T2Jq ZWN0ICoKIGZzaW1hZ2VfZnNfZ2V0YXR0cihmc2ltYWdlX2ZzX3QgKmZzLCBjaGFyICpuYW1lKQog ewogCXJldHVybiAoUHlfRmluZE1ldGhvZChmc2ltYWdlX2ZzX21ldGhvZHMsIChQeU9iamVjdCAq KWZzLCBuYW1lKSk7CiB9CisjZW5kaWYKIAogc3RhdGljIHZvaWQKIGZzaW1hZ2VfZnNfZGVhbGxv YyAoZnNpbWFnZV9mc190ICpmcykKQEAgLTIzMiwxNCArMjc4LDE3IEBAIGZzaW1hZ2VfZnNfZGVh bGxvYyAoZnNpbWFnZV9mc190ICpmcykKIFB5RG9jX1NUUlZBUihmc2ltYWdlX2ZzX3R5cGVfX2Rv Y19fLCAiRmlsZXN5c3RlbSBpbWFnZSIpOwogCiBQeVR5cGVPYmplY3QgZnNpbWFnZV9mc190eXBl ID0gewotCVB5T2JqZWN0X0hFQURfSU5JVCgmUHlUeXBlX1R5cGUpCi0JMCwJCQkJCS8qIG9iX3Np emUgKi8KKwlQeVZhck9iamVjdF9IRUFEX0lOSVQoJlB5VHlwZV9UeXBlLCAwKQogCSJ4ZW5mc2lt YWdlLmZzIiwJCQkvKiB0cF9uYW1lICovCiAJc2l6ZW9mKGZzaW1hZ2VfZnNfdCksCQkJLyogdHBf c2l6ZSAqLwogCTAsCQkJCQkvKiB0cF9pdGVtc2l6ZSAqLwogCShkZXN0cnVjdG9yKSBmc2ltYWdl X2ZzX2RlYWxsb2MsIAkvKiB0cF9kZWFsbG9jICovCiAJMCwJCQkJCS8qIHRwX3ByaW50ICovCisj aWYgUFlfTUFKT1JfVkVSU0lPTiA8IDMKIAkoZ2V0YXR0cmZ1bmMpIGZzaW1hZ2VfZnNfZ2V0YXR0 ciwgCS8qIHRwX2dldGF0dHIgKi8KKyNlbHNlCisJMCwJCQkJCS8qIHRwX2dldGF0dHIgKi8KKyNl bmRpZgogCTAsCQkJCQkvKiB0cF9zZXRhdHRyICovCiAJMCwJCQkJCS8qIHRwX2NvbXBhcmUgKi8K IAkwLAkJCQkJLyogdHBfcmVwciAqLwpAQCAtMjUzLDcgKzMwMiwxNiBAQCBQeVR5cGVPYmplY3Qg ZnNpbWFnZV9mc190eXBlID0gewogCTAsCQkJCQkvKiB0cF9zZXRhdHRybyAqLwogCTAsCQkJCQkv KiB0cF9hc19idWZmZXIgKi8KIAlQeV9UUEZMQUdTX0RFRkFVTFQsCQkJLyogdHBfZmxhZ3MgKi8K LQlmc2ltYWdlX2ZzX3R5cGVfX2RvY19fLAorCWZzaW1hZ2VfZnNfdHlwZV9fZG9jX18sCQkJLyog dHBfZG9jICovCisjaWYgUFlfTUFKT1JfVkVSU0lPTiA+PSAzCisJMCwJCQkJCS8qIHRwX3RyYXZl cnNlICovCisJMCwJCQkJCS8qIHRwX2NsZWFyICovCisJMCwJCQkJCS8qIHRwX3JpY2hjb21wYXJl ICovCisJMCwJCQkJCS8qIHRwX3dlYWtsaXN0b2Zmc2V0ICovCisJMCwJCQkJCS8qIHRwX2l0ZXIg Ki8KKwkwLAkJCQkJLyogdHBfaXRlcm5leHQgKi8KKwlmc2ltYWdlX2ZzX21ldGhvZHMsCQkJLyog dHBfbWV0aG9kcyAqLworI2VuZGlmCiAJUFlfUEFECiB9OwogCkBAIC0zMTYsOCArMzc0LDMwIEBA IHN0YXRpYyBzdHJ1Y3QgUHlNZXRob2REZWYgZnNpbWFnZV9tb2R1bGVfbWV0aG9kc1tdID0gewog CXsgTlVMTCwgTlVMTCwgMCwgTlVMTCB9CiB9OwogCisjaWYgUFlfTUFKT1JfVkVSU0lPTiA+PSAz CitzdGF0aWMgc3RydWN0IFB5TW9kdWxlRGVmIGZzaW1hZ2VfbW9kdWxlX2RlZiA9IHsKKwlQeU1v ZHVsZURlZl9IRUFEX0lOSVQsCisJInhlbmZzaW1hZ2UiLAkJLyogbV9uYW1lICovCisJIiIsCQkJ LyogbV9kb2MgKi8KKwktMSwJCQkvKiBtX3NpemUgKi8KKwlmc2ltYWdlX21vZHVsZV9tZXRob2Rz LAkvKiBtX21ldGhvZHMgKi8KKwlOVUxMLAkJCS8qIG1fcmVsb2FkICovCisJTlVMTCwJCQkvKiBt X3RyYXZlcnNlICovCisJTlVMTCwJCQkvKiBtX2NsZWFyICovCisJTlVMTAkJCS8qIG1fZnJlZSAq LworfTsKKyNlbmRpZgorCiBQeU1PRElOSVRfRlVOQworI2lmIFBZX01BSk9SX1ZFUlNJT04gPj0g MworUHlJbml0X3hlbmZzaW1hZ2Uodm9pZCkKKyNlbHNlCiBpbml0eGVuZnNpbWFnZSh2b2lkKQor I2VuZGlmCiB7CisjaWYgUFlfTUFKT1JfVkVSU0lPTiA8IDMKIAlQeV9Jbml0TW9kdWxlKCJ4ZW5m c2ltYWdlIiwgZnNpbWFnZV9tb2R1bGVfbWV0aG9kcyk7CisjZWxzZQorCXJldHVybiBQeU1vZHVs ZV9DcmVhdGUoJmZzaW1hZ2VfbW9kdWxlX2RlZik7CisjZW5kaWYKIH0KLS0gCjIuMTEuMAoKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBt YWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMu eGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=