From: Wei Liu Subject: [PATCH v3 7/7] pygrub/fsimage: make it work with python 3 Date: Mon, 11 Mar 2019 13:04:34 +0000 Message-ID: <20190311130434.10437-8-wei.liu2@citrix.com> References: <20190311130434.10437-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 1h3Kbj-0004JN-S9 for xen-devel@lists.xenproject.org; Mon, 11 Mar 2019 13:04:43 +0000 In-Reply-To: <20190311130434.10437-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: Anthony PERARD , Andrew Cooper , Ian Jackson , Wei Liu , George Dunlap List-Id: xen-devel@lists.xenproject.org V2l0aCB0aGUgaGVscCBvZiB0d28gcG9ydGluZyBndWlkZXMgYW5kIGNweXRob24gc291cmNlIGNv ZGU6CgoxLiBVc2UgUHlCeXRlcyB0byByZXBsYWNlIFB5U3RyaW5nIGNvdW50ZXJwYXJ0cy4KMi4g VXNlIFB5VmFyT2JqZWN0X0hFQURfSU5JVC4KMy4gUmVtb3ZlIHVzYWdlIG9mIFB5X0ZpbmRNZXRo b2QuCjQuIFVzZSBuZXcgbW9kdWxlIGluaXRpYWxpc2F0aW9uIHJvdXRpbmUuCgpGb3IgIzMsIFB5 X0ZpbmRNZXRob2Qgd2FzIHJlbW92ZWQsIHlldCBhbiBhbHRlcm5hdGl2ZSB3YXNuJ3QKZG9jdW1l bnRlZC4gIFRoZSBjb2RlIGlzIHRoZSByZXN1bHQgb2YgcmV2ZXJzZS1lbmdpbmVlcmluZyBjcHl0 aG9uCmNvbW1pdCA2MTE2ZDRhMWQxCgpodHRwczovL2RvY3MucHl0aG9uLm9yZy8zL2hvd3RvL2Nw b3J0aW5nLmh0bWwKaHR0cDovL3B5dGhvbjNwb3J0aW5nLmNvbS9jZXh0ZW5zaW9ucy5odG1sCgpT aWduZWQtb2ZmLWJ5OiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgotLS0KdjM6IHVzZSBQ eVR5cGVfUmVhZHkgdG8gaW5pdGlhbGlzZSB0eXBlcy4KdjI6IHVzZSBQeUJ5dGVzLgotLS0KIHRv b2xzL3B5Z3J1Yi9zcmMvZnNpbWFnZS9mc2ltYWdlLmMgfCA5MiArKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrLS0tLQogMSBmaWxlIGNoYW5nZWQsIDg0IGluc2VydGlvbnMoKyksIDgg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdG9vbHMvcHlncnViL3NyYy9mc2ltYWdlL2ZzaW1h Z2UuYyBiL3Rvb2xzL3B5Z3J1Yi9zcmMvZnNpbWFnZS9mc2ltYWdlLmMKaW5kZXggNzgwMjA3Nzkx Yy4uMDU3Nzg2ZDY3OCAxMDA2NDQKLS0tIGEvdG9vbHMvcHlncnViL3NyYy9mc2ltYWdlL2ZzaW1h Z2UuYworKysgYi90b29scy9weWdydWIvc3JjL2ZzaW1hZ2UvZnNpbWFnZS5jCkBAIC0yNiwxMSAr MjYsMTUgQEAKICNpbmNsdWRlIDx4ZW5mc2ltYWdlLmg+CiAjaW5jbHVkZSA8c3RkbGliLmg+CiAK KyNpZiBQWV9NQUpPUl9WRVJTSU9OIDwgMwogI2lmIChQWVRIT05fQVBJX1ZFUlNJT04gPj0gMTAx MSkKICNkZWZpbmUgUFlfUEFEIDBMLDBMLDBMLDBMLDBMLDBMLDBMLDBMLDBMLDBMLDBMLDBMLDBM LDBMLDBMLDBMLDBMLDBMLDBMLDBMLDBMLDBMLDBMLDBMCiAjZWxzZQogI2RlZmluZSBQWV9QQUQg MEwsMEwsMEwsMEwKICNlbmRpZgorI2Vsc2UKKyNkZWZpbmUgUFlfUEFEIDBMLDBMLDBMLDBMLDBM LDBMLDBMLDBMLDBMLDBMLDBMLDBMLDBMLDBMLDBMLDBMLDBMCisjZW5kaWYKIAogdHlwZWRlZiBz dHJ1Y3QgZnNpbWFnZV9mcyB7CiAJUHlPYmplY3RfSEVBRApAQCAtNTksMTIgKzYzLDI0IEBAIGZz aW1hZ2VfZmlsZV9yZWFkKGZzaW1hZ2VfZmlsZV90ICpmaWxlLCBQeU9iamVjdCAqYXJncywgUHlP YmplY3QgKmt3YXJncykKIAogCWJ1ZnNpemUgPSBzaXplID8gc2l6ZSA6IDQwOTY7CiAKLQlpZiAo KGJ1ZmZlciA9IFB5U3RyaW5nX0Zyb21TdHJpbmdBbmRTaXplKE5VTEwsIGJ1ZnNpemUpKSA9PSBO VUxMKQorCWJ1ZmZlciA9CisjaWYgUFlfTUFKT1JfVkVSU0lPTiA8IDMKKwkJUHlTdHJpbmdfRnJv bVN0cmluZ0FuZFNpemUoTlVMTCwgYnVmc2l6ZSk7CisjZWxzZQorCQlQeUJ5dGVzX0Zyb21TdHJp bmdBbmRTaXplKE5VTEwsIGJ1ZnNpemUpOworI2VuZGlmCisKKwlpZiAoYnVmZmVyID09IE5VTEwp CiAJCXJldHVybiAoTlVMTCk7CiAgCiAJd2hpbGUgKDEpIHsKIAkJaW50IGVycjsKLQkJdm9pZCAq YnVmID0gUHlTdHJpbmdfQVNfU1RSSU5HKGJ1ZmZlcikgKyBieXRlc3JlYWQ7CisJCXZvaWQgKmJ1 ZiA9CisjaWYgUFlfTUFKT1JfVkVSU0lPTiA8IDMKKwkJCVB5U3RyaW5nX0FTX1NUUklORyhidWZm ZXIpICsgYnl0ZXNyZWFkOworI2Vsc2UKKwkJCVB5Qnl0ZXNfQVNfU1RSSU5HKGJ1ZmZlcikgKyBi eXRlc3JlYWQ7CisjZW5kaWYKIAogCQllcnIgPSBmc2lfcHJlYWRfZmlsZShmaWxlLT5maWxlLCBi dWYsIGJ1ZnNpemUsCiAJCSAgICBieXRlc3JlYWQgKyBvZmZzZXQpOwpAQCAtODQsMTIgKzEwMCwy MCBAQCBmc2ltYWdlX2ZpbGVfcmVhZChmc2ltYWdlX2ZpbGVfdCAqZmlsZSwgUHlPYmplY3QgKmFy Z3MsIFB5T2JqZWN0ICprd2FyZ3MpCiAJCQlpZiAoYnVmc2l6ZSA9PSAwKQogCQkJCWJyZWFrOwog CQl9IGVsc2UgeworI2lmIFBZX01BSk9SX1ZFUlNJT04gPCAzCiAJCQlpZiAoX1B5U3RyaW5nX1Jl c2l6ZSgmYnVmZmVyLCBieXRlc3JlYWQgKyBidWZzaXplKSA8IDApCisjZWxzZQorCQkJaWYgKF9Q eUJ5dGVzX1Jlc2l6ZSgmYnVmZmVyLCBieXRlc3JlYWQgKyBidWZzaXplKSA8IDApCisjZW5kaWYK IAkJCQlyZXR1cm4gKE5VTEwpOwogCQl9CiAJfQogCisjaWYgUFlfTUFKT1JfVkVSU0lPTiA8IDMK IAlfUHlTdHJpbmdfUmVzaXplKCZidWZmZXIsIGJ5dGVzcmVhZCk7CisjZWxzZQorCV9QeUJ5dGVz X1Jlc2l6ZSgmYnVmZmVyLCBieXRlc3JlYWQpOworI2VuZGlmCiAJcmV0dXJuIChidWZmZXIpOwog fQogCkBAIC0xMDYsMTEgKzEzMCwxMyBAQCBzdGF0aWMgc3RydWN0IFB5TWV0aG9kRGVmIGZzaW1h Z2VfZmlsZV9tZXRob2RzW10gPSB7CiAJeyBOVUxMLCBOVUxMLCAwLCBOVUxMIH0JCiB9OwogCisj aWYgUFlfTUFKT1JfVkVSU0lPTiA8IDMKIHN0YXRpYyBQeU9iamVjdCAqCiBmc2ltYWdlX2ZpbGVf Z2V0YXR0cihmc2ltYWdlX2ZpbGVfdCAqZmlsZSwgY2hhciAqbmFtZSkKIHsKIAlyZXR1cm4gKFB5 X0ZpbmRNZXRob2QoZnNpbWFnZV9maWxlX21ldGhvZHMsIChQeU9iamVjdCAqKWZpbGUsIG5hbWUp KTsKIH0KKyNlbmRpZgogCiBzdGF0aWMgdm9pZAogZnNpbWFnZV9maWxlX2RlYWxsb2MoZnNpbWFn ZV9maWxlX3QgKmZpbGUpCkBAIC0xMjMsMTQgKzE0OSwxNyBAQCBmc2ltYWdlX2ZpbGVfZGVhbGxv Yyhmc2ltYWdlX2ZpbGVfdCAqZmlsZSkKIAogc3RhdGljIGNoYXIgZnNpbWFnZV9maWxlX3R5cGVf X2RvY19fW10gPSAiRmlsZXN5c3RlbSBpbWFnZSBmaWxlIjsKIFB5VHlwZU9iamVjdCBmc2ltYWdl X2ZpbGVfdHlwZSA9IHsKLQlQeU9iamVjdF9IRUFEX0lOSVQoJlB5VHlwZV9UeXBlKQotCTAsCQkJ CQkvKiBvYl9zaXplICovCisJUHlWYXJPYmplY3RfSEVBRF9JTklUKCZQeVR5cGVfVHlwZSwgMCkK IAkieGVuZnNpbWFnZS5maWxlIiwJCQkvKiB0cF9uYW1lICovCiAJc2l6ZW9mKGZzaW1hZ2VfZmls ZV90KSwJCQkvKiB0cF9zaXplICovCiAJMCwJCQkJCS8qIHRwX2l0ZW1zaXplICovCiAJKGRlc3Ry dWN0b3IpIGZzaW1hZ2VfZmlsZV9kZWFsbG9jLCAJLyogdHBfZGVhbGxvYyAqLwogCTAsCQkJCQkv KiB0cF9wcmludCAqLworI2lmIFBZX01BSk9SX1ZFUlNJT04gPCAzCiAJKGdldGF0dHJmdW5jKSBm c2ltYWdlX2ZpbGVfZ2V0YXR0ciwgCS8qIHRwX2dldGF0dHIgKi8KKyNlbHNlCisJMCwJCQkJCS8q IHRwX2dldGF0dHIgKi8KKyNlbmRpZgogCTAsCQkJCQkvKiB0cF9zZXRhdHRyICovCiAJMCwJCQkJ CS8qIHRwX2NvbXBhcmUgKi8KIAkwLAkJCQkJLyogdHBfcmVwciAqLwpAQCAtMTQ0LDcgKzE3Mywx NiBAQCBQeVR5cGVPYmplY3QgZnNpbWFnZV9maWxlX3R5cGUgPSB7CiAJMCwJCQkJCS8qIHRwX3Nl dGF0dHJvICovCiAJMCwJCQkJCS8qIHRwX2FzX2J1ZmZlciAqLwogCVB5X1RQRkxBR1NfREVGQVVM VCwJCQkvKiB0cF9mbGFncyAqLwotCWZzaW1hZ2VfZmlsZV90eXBlX19kb2NfXywKKwlmc2ltYWdl X2ZpbGVfdHlwZV9fZG9jX18sCQkvKiB0cF9kb2MgKi8KKyNpZiBQWV9NQUpPUl9WRVJTSU9OID49 IDMKKwkwLAkJCQkJLyogdHBfdHJhdmVyc2UgKi8KKwkwLAkJCQkJLyogdHBfY2xlYXIgKi8KKwkw LAkJCQkJLyogdHBfcmljaGNvbXBhcmUgKi8KKwkwLAkJCQkJLyogdHBfd2Vha2xpc3RvZmZzZXQg Ki8KKwkwLAkJCQkJLyogdHBfaXRlciAqLworCTAsCQkJCQkvKiB0cF9pdGVybmV4dCAqLworCWZz aW1hZ2VfZmlsZV9tZXRob2RzLAkJCS8qIHRwX21ldGhvZHMgKi8KKyNlbmRpZgogCVBZX1BBRAog fTsKIApAQCAtMjA4LDExICsyNDYsMTMgQEAgc3RhdGljIHN0cnVjdCBQeU1ldGhvZERlZiBmc2lt YWdlX2ZzX21ldGhvZHNbXSA9IHsKIAl7IE5VTEwsIE5VTEwsIDAsIE5VTEwgfQkKIH07CiAKKyNp ZiBQWV9NQUpPUl9WRVJTSU9OIDwgMwogc3RhdGljIFB5T2JqZWN0ICoKIGZzaW1hZ2VfZnNfZ2V0 YXR0cihmc2ltYWdlX2ZzX3QgKmZzLCBjaGFyICpuYW1lKQogewogCXJldHVybiAoUHlfRmluZE1l dGhvZChmc2ltYWdlX2ZzX21ldGhvZHMsIChQeU9iamVjdCAqKWZzLCBuYW1lKSk7CiB9CisjZW5k aWYKIAogc3RhdGljIHZvaWQKIGZzaW1hZ2VfZnNfZGVhbGxvYyAoZnNpbWFnZV9mc190ICpmcykK QEAgLTIyNSwxNCArMjY1LDE3IEBAIGZzaW1hZ2VfZnNfZGVhbGxvYyAoZnNpbWFnZV9mc190ICpm cykKIFB5RG9jX1NUUlZBUihmc2ltYWdlX2ZzX3R5cGVfX2RvY19fLCAiRmlsZXN5c3RlbSBpbWFn ZSIpOwogCiBQeVR5cGVPYmplY3QgZnNpbWFnZV9mc190eXBlID0gewotCVB5T2JqZWN0X0hFQURf SU5JVCgmUHlUeXBlX1R5cGUpCi0JMCwJCQkJCS8qIG9iX3NpemUgKi8KKwlQeVZhck9iamVjdF9I RUFEX0lOSVQoJlB5VHlwZV9UeXBlLCAwKQogCSJ4ZW5mc2ltYWdlLmZzIiwJCQkvKiB0cF9uYW1l ICovCiAJc2l6ZW9mKGZzaW1hZ2VfZnNfdCksCQkJLyogdHBfc2l6ZSAqLwogCTAsCQkJCQkvKiB0 cF9pdGVtc2l6ZSAqLwogCShkZXN0cnVjdG9yKSBmc2ltYWdlX2ZzX2RlYWxsb2MsIAkvKiB0cF9k ZWFsbG9jICovCiAJMCwJCQkJCS8qIHRwX3ByaW50ICovCisjaWYgUFlfTUFKT1JfVkVSU0lPTiA8 IDMKIAkoZ2V0YXR0cmZ1bmMpIGZzaW1hZ2VfZnNfZ2V0YXR0ciwgCS8qIHRwX2dldGF0dHIgKi8K KyNlbHNlCisJMCwJCQkJCS8qIHRwX2dldGF0dHIgKi8KKyNlbmRpZgogCTAsCQkJCQkvKiB0cF9z ZXRhdHRyICovCiAJMCwJCQkJCS8qIHRwX2NvbXBhcmUgKi8KIAkwLAkJCQkJLyogdHBfcmVwciAq LwpAQCAtMjQ2LDcgKzI4OSwxNiBAQCBQeVR5cGVPYmplY3QgZnNpbWFnZV9mc190eXBlID0gewog CTAsCQkJCQkvKiB0cF9zZXRhdHRybyAqLwogCTAsCQkJCQkvKiB0cF9hc19idWZmZXIgKi8KIAlQ eV9UUEZMQUdTX0RFRkFVTFQsCQkJLyogdHBfZmxhZ3MgKi8KLQlmc2ltYWdlX2ZzX3R5cGVfX2Rv Y19fLAorCWZzaW1hZ2VfZnNfdHlwZV9fZG9jX18sCQkJLyogdHBfZG9jICovCisjaWYgUFlfTUFK T1JfVkVSU0lPTiA+PSAzCisJMCwJCQkJCS8qIHRwX3RyYXZlcnNlICovCisJMCwJCQkJCS8qIHRw X2NsZWFyICovCisJMCwJCQkJCS8qIHRwX3JpY2hjb21wYXJlICovCisJMCwJCQkJCS8qIHRwX3dl YWtsaXN0b2Zmc2V0ICovCisJMCwJCQkJCS8qIHRwX2l0ZXIgKi8KKwkwLAkJCQkJLyogdHBfaXRl cm5leHQgKi8KKwlmc2ltYWdlX2ZzX21ldGhvZHMsCQkJLyogdHBfbWV0aG9kcyAqLworI2VuZGlm CiAJUFlfUEFECiB9OwogCkBAIC0zMDksOCArMzYxLDMyIEBAIHN0YXRpYyBzdHJ1Y3QgUHlNZXRo b2REZWYgZnNpbWFnZV9tb2R1bGVfbWV0aG9kc1tdID0gewogCXsgTlVMTCwgTlVMTCwgMCwgTlVM TCB9CiB9OwogCisjaWYgUFlfTUFKT1JfVkVSU0lPTiA+PSAzCitzdGF0aWMgc3RydWN0IFB5TW9k dWxlRGVmIGZzaW1hZ2VfbW9kdWxlX2RlZiA9IHsKKwlQeU1vZHVsZURlZl9IRUFEX0lOSVQsCisJ InhlbmZzaW1hZ2UiLAkJLyogbV9uYW1lICovCisJIiIsCQkJLyogbV9kb2MgKi8KKwktMSwJCQkv KiBtX3NpemUgKi8KKwlmc2ltYWdlX21vZHVsZV9tZXRob2RzLAkvKiBtX21ldGhvZHMgKi8KKwlO VUxMLAkJCS8qIG1fcmVsb2FkICovCisJTlVMTCwJCQkvKiBtX3RyYXZlcnNlICovCisJTlVMTCwJ CQkvKiBtX2NsZWFyICovCisJTlVMTAkJCS8qIG1fZnJlZSAqLworfTsKKyNlbmRpZgorCiBQeU1P RElOSVRfRlVOQworI2lmIFBZX01BSk9SX1ZFUlNJT04gPj0gMworUHlJbml0X3hlbmZzaW1hZ2Uo dm9pZCkKKyNlbHNlCiBpbml0eGVuZnNpbWFnZSh2b2lkKQorI2VuZGlmCiB7CisjaWYgUFlfTUFK T1JfVkVSU0lPTiA8IDMKIAlQeV9Jbml0TW9kdWxlKCJ4ZW5mc2ltYWdlIiwgZnNpbWFnZV9tb2R1 bGVfbWV0aG9kcyk7CisjZWxzZQorCWlmIChQeVR5cGVfUmVhZHkoJmZzaW1hZ2VfZnNfdHlwZSkg PCAwIHx8IFB5VHlwZV9SZWFkeSgmZnNpbWFnZV9maWxlX3R5cGUpIDwgMCkKKwkJcmV0dXJuIE5V TEw7CisJcmV0dXJuIFB5TW9kdWxlX0NyZWF0ZSgmZnNpbWFnZV9tb2R1bGVfZGVmKTsKKyNlbmRp ZgogfQotLSAKMi4xMS4wCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVj dC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1k ZXZlbA==