From: Wei Liu Subject: [PATCH v4 7/8] pygrub/fsimage: make it work with python 3 Date: Mon, 11 Mar 2019 18:01:36 +0000 Message-ID: <20190311180137.7805-8-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 1h3PFF-0000X5-3V for xen-devel@lists.xenproject.org; Mon, 11 Mar 2019 18:01:49 +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 V2l0aCB0aGUgaGVscCBvZiB0d28gcG9ydGluZyBndWlkZXMgYW5kIGNweXRob24gc291cmNlIGNv ZGU6CgoxLiBVc2UgUHlCeXRlcyB0byByZXBsYWNlIFB5U3RyaW5nIGNvdW50ZXJwYXJ0cy4KMi4g VXNlIFB5VmFyT2JqZWN0X0hFQURfSU5JVC4KMy4gUmVtb3ZlIHVzYWdlIG9mIFB5X0ZpbmRNZXRo b2QuCjQuIFVzZSBuZXcgbW9kdWxlIGluaXRpYWxpc2F0aW9uIHJvdXRpbmUuCgpGb3IgIzMsIFB5 X0ZpbmRNZXRob2Qgd2FzIHJlbW92ZWQsIHlldCBhbiBhbHRlcm5hdGl2ZSB3YXNuJ3QKZG9jdW1l bnRlZC4gIFRoZSBjb2RlIGlzIHRoZSByZXN1bHQgb2YgcmV2ZXJzZS1lbmdpbmVlcmluZyBjcHl0 aG9uCmNvbW1pdCA2MTE2ZDRhMWQxCgpodHRwczovL2RvY3MucHl0aG9uLm9yZy8zL2hvd3RvL2Nw b3J0aW5nLmh0bWwKaHR0cDovL3B5dGhvbjNwb3J0aW5nLmNvbS9jZXh0ZW5zaW9ucy5odG1sCgpT aWduZWQtb2ZmLWJ5OiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgpSZXZpZXdlZC1ieTog QW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KLS0tCiB0b29scy9weWdy dWIvc3JjL2ZzaW1hZ2UvZnNpbWFnZS5jIHwgMTIzICsrKysrKysrKysrKysrKysrKysrKy0tLS0t LS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA2OSBpbnNlcnRpb25zKCspLCA1NCBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS90b29scy9weWdydWIvc3JjL2ZzaW1hZ2UvZnNpbWFnZS5jIGIv dG9vbHMvcHlncnViL3NyYy9mc2ltYWdlL2ZzaW1hZ2UuYwppbmRleCA3ODAyMDc3OTFjLi4yZWJi YmUzNWRmIDEwMDY0NAotLS0gYS90b29scy9weWdydWIvc3JjL2ZzaW1hZ2UvZnNpbWFnZS5jCisr KyBiL3Rvb2xzL3B5Z3J1Yi9zcmMvZnNpbWFnZS9mc2ltYWdlLmMKQEAgLTI2LDEyICsyNiw2IEBA CiAjaW5jbHVkZSA8eGVuZnNpbWFnZS5oPgogI2luY2x1ZGUgPHN0ZGxpYi5oPgogCi0jaWYgKFBZ VEhPTl9BUElfVkVSU0lPTiA+PSAxMDExKQotI2RlZmluZSBQWV9QQUQgMEwsMEwsMEwsMEwsMEws MEwsMEwsMEwsMEwsMEwsMEwsMEwsMEwsMEwsMEwsMEwsMEwsMEwsMEwsMEwsMEwsMEwsMEwsMEwK LSNlbHNlCi0jZGVmaW5lIFBZX1BBRCAwTCwwTCwwTCwwTAotI2VuZGlmCi0KIHR5cGVkZWYgc3Ry dWN0IGZzaW1hZ2VfZnMgewogCVB5T2JqZWN0X0hFQUQKIAlmc2lfdCAqZnM7CkBAIC01OSwxMiAr NTMsMjQgQEAgZnNpbWFnZV9maWxlX3JlYWQoZnNpbWFnZV9maWxlX3QgKmZpbGUsIFB5T2JqZWN0 ICphcmdzLCBQeU9iamVjdCAqa3dhcmdzKQogCiAJYnVmc2l6ZSA9IHNpemUgPyBzaXplIDogNDA5 NjsKIAotCWlmICgoYnVmZmVyID0gUHlTdHJpbmdfRnJvbVN0cmluZ0FuZFNpemUoTlVMTCwgYnVm c2l6ZSkpID09IE5VTEwpCisJYnVmZmVyID0KKyNpZiBQWV9NQUpPUl9WRVJTSU9OIDwgMworCQlQ eVN0cmluZ19Gcm9tU3RyaW5nQW5kU2l6ZShOVUxMLCBidWZzaXplKTsKKyNlbHNlCisJCVB5Qnl0 ZXNfRnJvbVN0cmluZ0FuZFNpemUoTlVMTCwgYnVmc2l6ZSk7CisjZW5kaWYKKworCWlmIChidWZm ZXIgPT0gTlVMTCkKIAkJcmV0dXJuIChOVUxMKTsKICAKIAl3aGlsZSAoMSkgewogCQlpbnQgZXJy OwotCQl2b2lkICpidWYgPSBQeVN0cmluZ19BU19TVFJJTkcoYnVmZmVyKSArIGJ5dGVzcmVhZDsK KwkJdm9pZCAqYnVmID0KKyNpZiBQWV9NQUpPUl9WRVJTSU9OIDwgMworCQkJUHlTdHJpbmdfQVNf U1RSSU5HKGJ1ZmZlcikgKyBieXRlc3JlYWQ7CisjZWxzZQorCQkJUHlCeXRlc19BU19TVFJJTkco YnVmZmVyKSArIGJ5dGVzcmVhZDsKKyNlbmRpZgogCiAJCWVyciA9IGZzaV9wcmVhZF9maWxlKGZp bGUtPmZpbGUsIGJ1ZiwgYnVmc2l6ZSwKIAkJICAgIGJ5dGVzcmVhZCArIG9mZnNldCk7CkBAIC04 NCwxMiArOTAsMjAgQEAgZnNpbWFnZV9maWxlX3JlYWQoZnNpbWFnZV9maWxlX3QgKmZpbGUsIFB5 T2JqZWN0ICphcmdzLCBQeU9iamVjdCAqa3dhcmdzKQogCQkJaWYgKGJ1ZnNpemUgPT0gMCkKIAkJ CQlicmVhazsKIAkJfSBlbHNlIHsKKyNpZiBQWV9NQUpPUl9WRVJTSU9OIDwgMwogCQkJaWYgKF9Q eVN0cmluZ19SZXNpemUoJmJ1ZmZlciwgYnl0ZXNyZWFkICsgYnVmc2l6ZSkgPCAwKQorI2Vsc2UK KwkJCWlmIChfUHlCeXRlc19SZXNpemUoJmJ1ZmZlciwgYnl0ZXNyZWFkICsgYnVmc2l6ZSkgPCAw KQorI2VuZGlmCiAJCQkJcmV0dXJuIChOVUxMKTsKIAkJfQogCX0KIAorI2lmIFBZX01BSk9SX1ZF UlNJT04gPCAzCiAJX1B5U3RyaW5nX1Jlc2l6ZSgmYnVmZmVyLCBieXRlc3JlYWQpOworI2Vsc2UK KwlfUHlCeXRlc19SZXNpemUoJmJ1ZmZlciwgYnl0ZXNyZWFkKTsKKyNlbmRpZgogCXJldHVybiAo YnVmZmVyKTsKIH0KIApAQCAtMTA2LDExICsxMjAsMTMgQEAgc3RhdGljIHN0cnVjdCBQeU1ldGhv ZERlZiBmc2ltYWdlX2ZpbGVfbWV0aG9kc1tdID0gewogCXsgTlVMTCwgTlVMTCwgMCwgTlVMTCB9 CQogfTsKIAorI2lmIFBZX01BSk9SX1ZFUlNJT04gPCAzCiBzdGF0aWMgUHlPYmplY3QgKgogZnNp bWFnZV9maWxlX2dldGF0dHIoZnNpbWFnZV9maWxlX3QgKmZpbGUsIGNoYXIgKm5hbWUpCiB7CiAJ cmV0dXJuIChQeV9GaW5kTWV0aG9kKGZzaW1hZ2VfZmlsZV9tZXRob2RzLCAoUHlPYmplY3QgKilm aWxlLCBuYW1lKSk7CiB9CisjZW5kaWYKIAogc3RhdGljIHZvaWQKIGZzaW1hZ2VfZmlsZV9kZWFs bG9jKGZzaW1hZ2VfZmlsZV90ICpmaWxlKQpAQCAtMTIzLDI5ICsxMzksMTggQEAgZnNpbWFnZV9m aWxlX2RlYWxsb2MoZnNpbWFnZV9maWxlX3QgKmZpbGUpCiAKIHN0YXRpYyBjaGFyIGZzaW1hZ2Vf ZmlsZV90eXBlX19kb2NfX1tdID0gIkZpbGVzeXN0ZW0gaW1hZ2UgZmlsZSI7CiBQeVR5cGVPYmpl Y3QgZnNpbWFnZV9maWxlX3R5cGUgPSB7Ci0JUHlPYmplY3RfSEVBRF9JTklUKCZQeVR5cGVfVHlw ZSkKLQkwLAkJCQkJLyogb2Jfc2l6ZSAqLwotCSJ4ZW5mc2ltYWdlLmZpbGUiLAkJCS8qIHRwX25h bWUgKi8KLQlzaXplb2YoZnNpbWFnZV9maWxlX3QpLAkJCS8qIHRwX3NpemUgKi8KLQkwLAkJCQkJ LyogdHBfaXRlbXNpemUgKi8KLQkoZGVzdHJ1Y3RvcikgZnNpbWFnZV9maWxlX2RlYWxsb2MsIAkv KiB0cF9kZWFsbG9jICovCi0JMCwJCQkJCS8qIHRwX3ByaW50ICovCi0JKGdldGF0dHJmdW5jKSBm c2ltYWdlX2ZpbGVfZ2V0YXR0ciwgCS8qIHRwX2dldGF0dHIgKi8KLQkwLAkJCQkJLyogdHBfc2V0 YXR0ciAqLwotCTAsCQkJCQkvKiB0cF9jb21wYXJlICovCi0JMCwJCQkJCS8qIHRwX3JlcHIgKi8K LQkwLAkJCQkJLyogdHBfYXNfbnVtYmVyICovCi0JMCwJIAkJCQkvKiB0cF9hc19zZXF1ZW5jZSAq LwotCTAsCQkJCQkvKiB0cF9hc19tYXBwaW5nICovCi0JMCwJICAgCQkJCS8qIHRwX2hhc2ggKi8K LQkwLAkJCQkJLyogdHBfY2FsbCAqLwotCTAsCQkJCQkvKiB0cF9zdHIgKi8KLQkwLAkJCQkJLyog dHBfZ2V0YXR0cm8gKi8KLQkwLAkJCQkJLyogdHBfc2V0YXR0cm8gKi8KLQkwLAkJCQkJLyogdHBf YXNfYnVmZmVyICovCi0JUHlfVFBGTEFHU19ERUZBVUxULAkJCS8qIHRwX2ZsYWdzICovCi0JZnNp bWFnZV9maWxlX3R5cGVfX2RvY19fLAotCVBZX1BBRAorCVB5VmFyT2JqZWN0X0hFQURfSU5JVCgm UHlUeXBlX1R5cGUsIDApCisJLnRwX25hbWUgPSAieGVuZnNpbWFnZS5maWxlIiwKKwkudHBfYmFz aWNzaXplID0gc2l6ZW9mKGZzaW1hZ2VfZmlsZV90KSwKKwkudHBfZGVhbGxvYyA9IChkZXN0cnVj dG9yKSBmc2ltYWdlX2ZpbGVfZGVhbGxvYywKKyNpZiBQWV9NQUpPUl9WRVJTSU9OIDwgMworCS50 cF9nZXRhdHRyID0gKGdldGF0dHJmdW5jKSBmc2ltYWdlX2ZpbGVfZ2V0YXR0ciwKKyNlbmRpZgor CS50cF9mbGFncyA9IFB5X1RQRkxBR1NfREVGQVVMVCwKKwkudHBfZG9jID0gZnNpbWFnZV9maWxl X3R5cGVfX2RvY19fLAorI2lmIFBZX01BSk9SX1ZFUlNJT04gPj0gMworCS50cF9tZXRob2RzID0g ZnNpbWFnZV9maWxlX21ldGhvZHMsCisjZW5kaWYKIH07CiAKIHN0YXRpYyBQeU9iamVjdCAqCkBA IC0yMDgsMTEgKzIxMywxMyBAQCBzdGF0aWMgc3RydWN0IFB5TWV0aG9kRGVmIGZzaW1hZ2VfZnNf bWV0aG9kc1tdID0gewogCXsgTlVMTCwgTlVMTCwgMCwgTlVMTCB9CQogfTsKIAorI2lmIFBZX01B Sk9SX1ZFUlNJT04gPCAzCiBzdGF0aWMgUHlPYmplY3QgKgogZnNpbWFnZV9mc19nZXRhdHRyKGZz aW1hZ2VfZnNfdCAqZnMsIGNoYXIgKm5hbWUpCiB7CiAJcmV0dXJuIChQeV9GaW5kTWV0aG9kKGZz aW1hZ2VfZnNfbWV0aG9kcywgKFB5T2JqZWN0ICopZnMsIG5hbWUpKTsKIH0KKyNlbmRpZgogCiBz dGF0aWMgdm9pZAogZnNpbWFnZV9mc19kZWFsbG9jIChmc2ltYWdlX2ZzX3QgKmZzKQpAQCAtMjI1 LDI5ICsyMzIsMTggQEAgZnNpbWFnZV9mc19kZWFsbG9jIChmc2ltYWdlX2ZzX3QgKmZzKQogUHlE b2NfU1RSVkFSKGZzaW1hZ2VfZnNfdHlwZV9fZG9jX18sICJGaWxlc3lzdGVtIGltYWdlIik7CiAK IFB5VHlwZU9iamVjdCBmc2ltYWdlX2ZzX3R5cGUgPSB7Ci0JUHlPYmplY3RfSEVBRF9JTklUKCZQ eVR5cGVfVHlwZSkKLQkwLAkJCQkJLyogb2Jfc2l6ZSAqLwotCSJ4ZW5mc2ltYWdlLmZzIiwJCQkv KiB0cF9uYW1lICovCi0Jc2l6ZW9mKGZzaW1hZ2VfZnNfdCksCQkJLyogdHBfc2l6ZSAqLwotCTAs CQkJCQkvKiB0cF9pdGVtc2l6ZSAqLwotCShkZXN0cnVjdG9yKSBmc2ltYWdlX2ZzX2RlYWxsb2Ms IAkvKiB0cF9kZWFsbG9jICovCi0JMCwJCQkJCS8qIHRwX3ByaW50ICovCi0JKGdldGF0dHJmdW5j KSBmc2ltYWdlX2ZzX2dldGF0dHIsIAkvKiB0cF9nZXRhdHRyICovCi0JMCwJCQkJCS8qIHRwX3Nl dGF0dHIgKi8KLQkwLAkJCQkJLyogdHBfY29tcGFyZSAqLwotCTAsCQkJCQkvKiB0cF9yZXByICov Ci0JMCwJCQkJCS8qIHRwX2FzX251bWJlciAqLwotCTAsCSAJCQkJLyogdHBfYXNfc2VxdWVuY2Ug Ki8KLQkwLAkJCQkJLyogdHBfYXNfbWFwcGluZyAqLwotCTAsCSAgIAkJCQkvKiB0cF9oYXNoICov Ci0JMCwJCQkJCS8qIHRwX2NhbGwgKi8KLQkwLAkJCQkJLyogdHBfc3RyICovCi0JMCwJCQkJCS8q IHRwX2dldGF0dHJvICovCi0JMCwJCQkJCS8qIHRwX3NldGF0dHJvICovCi0JMCwJCQkJCS8qIHRw X2FzX2J1ZmZlciAqLwotCVB5X1RQRkxBR1NfREVGQVVMVCwJCQkvKiB0cF9mbGFncyAqLwotCWZz aW1hZ2VfZnNfdHlwZV9fZG9jX18sCi0JUFlfUEFECisJUHlWYXJPYmplY3RfSEVBRF9JTklUKCZQ eVR5cGVfVHlwZSwgMCkKKwkudHBfbmFtZSA9ICJ4ZW5mc2ltYWdlLmZzIiwKKwkudHBfYmFzaWNz aXplID0gc2l6ZW9mKGZzaW1hZ2VfZnNfdCksCisJLnRwX2RlYWxsb2MgPSAoZGVzdHJ1Y3Rvcikg ZnNpbWFnZV9mc19kZWFsbG9jLAorI2lmIFBZX01BSk9SX1ZFUlNJT04gPCAzCisJLnRwX2dldGF0 dHIgPSAoZ2V0YXR0cmZ1bmMpIGZzaW1hZ2VfZnNfZ2V0YXR0ciwKKyNlbmRpZgorCS50cF9mbGFn cyA9IFB5X1RQRkxBR1NfREVGQVVMVCwKKwkudHBfZG9jID0gZnNpbWFnZV9mc190eXBlX19kb2Nf XywKKyNpZiBQWV9NQUpPUl9WRVJTSU9OID49IDMKKwkudHBfbWV0aG9kcyA9IGZzaW1hZ2VfZnNf bWV0aG9kcywKKyNlbmRpZgogfTsKIAogc3RhdGljIFB5T2JqZWN0ICoKQEAgLTMwOSw4ICszMDUs MjcgQEAgc3RhdGljIHN0cnVjdCBQeU1ldGhvZERlZiBmc2ltYWdlX21vZHVsZV9tZXRob2RzW10g PSB7CiAJeyBOVUxMLCBOVUxMLCAwLCBOVUxMIH0KIH07CiAKKyNpZiBQWV9NQUpPUl9WRVJTSU9O ID49IDMKK3N0YXRpYyBzdHJ1Y3QgUHlNb2R1bGVEZWYgZnNpbWFnZV9tb2R1bGVfZGVmID0gewor CVB5TW9kdWxlRGVmX0hFQURfSU5JVCwKKwkubV9uYW1lID0gInhlbmZzaW1hZ2UiLAorCS5tX3Np emUgPSAtMSwKKwkubV9tZXRob2RzID0gZnNpbWFnZV9tb2R1bGVfbWV0aG9kcywKK307CisjZW5k aWYKKwogUHlNT0RJTklUX0ZVTkMKKyNpZiBQWV9NQUpPUl9WRVJTSU9OID49IDMKK1B5SW5pdF94 ZW5mc2ltYWdlKHZvaWQpCisjZWxzZQogaW5pdHhlbmZzaW1hZ2Uodm9pZCkKKyNlbmRpZgogewor I2lmIFBZX01BSk9SX1ZFUlNJT04gPCAzCiAJUHlfSW5pdE1vZHVsZSgieGVuZnNpbWFnZSIsIGZz aW1hZ2VfbW9kdWxlX21ldGhvZHMpOworI2Vsc2UKKwlpZiAoUHlUeXBlX1JlYWR5KCZmc2ltYWdl X2ZzX3R5cGUpIDwgMCB8fCBQeVR5cGVfUmVhZHkoJmZzaW1hZ2VfZmlsZV90eXBlKSA8IDApCisJ CXJldHVybiBOVUxMOworCXJldHVybiBQeU1vZHVsZV9DcmVhdGUoJmZzaW1hZ2VfbW9kdWxlX2Rl Zik7CisjZW5kaWYKIH0KLS0gCjIuMTEuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3Rz LnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0 aW5mby94ZW4tZGV2ZWw=