From: Juergen Gross Subject: [PATCH 6/8] xenpvh: support building a standalone image Date: Wed, 29 Nov 2017 14:46:48 +0100 Message-ID: <20171129134650.20102-7-jgross@suse.com> References: <20171129134650.20102-1-jgross@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20171129134650.20102-1-jgross@suse.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: grub-devel@gnu.org Cc: Juergen Gross , phcoder@gmail.com, daniel.kiper@oracle.com, xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org U3VwcG9yIG1raW1hZ2UgZm9yIHhlbnB2aC4KClNpZ25lZC1vZmYtYnk6IEp1ZXJnZW4gR3Jvc3Mg PGpncm9zc0BzdXNlLmNvbT4KLS0tCiBpbmNsdWRlL2dydWIvdXRpbC9ta2ltYWdlLmggfCAgMyAr Ky0KIHV0aWwvZ3J1Yi1ta2ltYWdlMzIuYyAgICAgICB8ICAxICsKIHV0aWwvZ3J1Yi1ta2ltYWdl NjQuYyAgICAgICB8ICAxICsKIHV0aWwvZ3J1Yi1ta2ltYWdleHguYyAgICAgICB8IDQ0ICsrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tCiB1dGlsL21raW1hZ2UuYyAg ICAgICAgICAgICAgfCAyMyArKysrKysrKysrKysrKysrKysrKysrLQogNSBmaWxlcyBjaGFuZ2Vk LCA2NiBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2luY2x1ZGUv Z3J1Yi91dGlsL21raW1hZ2UuaCBiL2luY2x1ZGUvZ3J1Yi91dGlsL21raW1hZ2UuaAppbmRleCBi M2E1Y2ExMzIuLjNmNWJjMmUwMCAxMDA2NDQKLS0tIGEvaW5jbHVkZS9ncnViL3V0aWwvbWtpbWFn ZS5oCisrKyBiL2luY2x1ZGUvZ3J1Yi91dGlsL21raW1hZ2UuaApAQCAtNzEsNyArNzEsOCBAQCBz dHJ1Y3QgZ3J1Yl9pbnN0YWxsX2ltYWdlX3RhcmdldF9kZXNjCiAgICAgSU1BR0VfSTM4Nl9JRUVF MTI3NSwKICAgICBJTUFHRV9MT09OR1NPTl9FTEYsIElNQUdFX1FFTVUsIElNQUdFX1BQQywgSU1B R0VfWUVFTE9PTkdfRkxBU0gsCiAgICAgSU1BR0VfRlVMT09ORzJGX0ZMQVNILCBJTUFHRV9JMzg2 X1BDX1BYRSwgSU1BR0VfTUlQU19BUkMsCi0gICAgSU1BR0VfUUVNVV9NSVBTX0ZMQVNILCBJTUFH RV9VQk9PVCwgSU1BR0VfWEVOLCBJTUFHRV9JMzg2X1BDX0VMVE9SSVRPCisgICAgSU1BR0VfUUVN VV9NSVBTX0ZMQVNILCBJTUFHRV9VQk9PVCwgSU1BR0VfWEVOLCBJTUFHRV9JMzg2X1BDX0VMVE9S SVRPLAorICAgIElNQUdFX1hFTlBWSAogICB9IGlkOwogICBlbnVtCiAgICAgewpkaWZmIC0tZ2l0 IGEvdXRpbC9ncnViLW1raW1hZ2UzMi5jIGIvdXRpbC9ncnViLW1raW1hZ2UzMi5jCmluZGV4IDli MzEzOTdiYy4uNDI1M2M0ODk3IDEwMDY0NAotLS0gYS91dGlsL2dydWItbWtpbWFnZTMyLmMKKysr IGIvdXRpbC9ncnViLW1raW1hZ2UzMi5jCkBAIC0xOCw1ICsxOCw2IEBACiAjIGRlZmluZSBFTEZf Ul9UWVBFKHZhbCkJCUVMRjMyX1JfVFlQRSh2YWwpCiAjIGRlZmluZSBFTEZfU1RfVFlQRSh2YWwp CQlFTEYzMl9TVF9UWVBFKHZhbCkKICNkZWZpbmUgWEVOX05PVEVfU0laRSAxMzIKKyNkZWZpbmUg WEVOUFZIX05PVEVfU0laRSAyMAogCiAjaW5jbHVkZSAiZ3J1Yi1ta2ltYWdleHguYyIKZGlmZiAt LWdpdCBhL3V0aWwvZ3J1Yi1ta2ltYWdlNjQuYyBiL3V0aWwvZ3J1Yi1ta2ltYWdlNjQuYwppbmRl eCBkODMzNDU5MjQuLmM4NjJiZThjMCAxMDA2NDQKLS0tIGEvdXRpbC9ncnViLW1raW1hZ2U2NC5j CisrKyBiL3V0aWwvZ3J1Yi1ta2ltYWdlNjQuYwpAQCAtMTgsNSArMTgsNiBAQAogIyBkZWZpbmUg RUxGX1JfVFlQRSh2YWwpCQlFTEY2NF9SX1RZUEUodmFsKQogIyBkZWZpbmUgRUxGX1NUX1RZUEUo dmFsKQkJRUxGNjRfU1RfVFlQRSh2YWwpCiAjZGVmaW5lIFhFTl9OT1RFX1NJWkUgMTIwCisjZGVm aW5lIFhFTlBWSF9OT1RFX1NJWkUgMjQKIAogI2luY2x1ZGUgImdydWItbWtpbWFnZXh4LmMiCmRp ZmYgLS1naXQgYS91dGlsL2dydWItbWtpbWFnZXh4LmMgYi91dGlsL2dydWItbWtpbWFnZXh4LmMK aW5kZXggYTJiYjA1NDM5Li5hMDI0ZTU3YjYgMTAwNjQ0Ci0tLSBhL3V0aWwvZ3J1Yi1ta2ltYWdl eHguYworKysgYi91dGlsL2dydWItbWtpbWFnZXh4LmMKQEAgLTIwNywxMiArMjA3LDEyIEBAIFNV RkZJWCAoZ3J1Yl9ta2ltYWdlX2dlbmVyYXRlX2VsZikgKGNvbnN0IHN0cnVjdCBncnViX2luc3Rh bGxfaW1hZ2VfdGFyZ2V0X2Rlc2MKICAgICAgIHBobnVtKys7CiAgICAgICBmb290ZXJfc2l6ZSAr PSBzaXplb2YgKHN0cnVjdCBncnViX2llZWUxMjc1X25vdGUpOwogICAgIH0KLSAgaWYgKGltYWdl X3RhcmdldC0+aWQgPT0gSU1BR0VfWEVOKQorICBpZiAoaW1hZ2VfdGFyZ2V0LT5pZCA9PSBJTUFH RV9YRU4gfHwgaW1hZ2VfdGFyZ2V0LT5pZCA9PSBJTUFHRV9YRU5QVkgpCiAgICAgewogICAgICAg cGhudW0rKzsKICAgICAgIHNobnVtKys7CiAgICAgICBzdHJpbmdfc2l6ZSArPSBzaXplb2YgKCIu eGVuIik7Ci0gICAgICBmb290ZXJfc2l6ZSArPSBYRU5fTk9URV9TSVpFOworICAgICAgZm9vdGVy X3NpemUgKz0gKGltYWdlX3RhcmdldC0+aWQgPT0gSU1BR0VfWEVOKSA/IFhFTl9OT1RFX1NJWkUg OiBYRU5QVkhfTk9URV9TSVpFOwogICAgIH0KICAgaGVhZGVyX3NpemUgPSBBTElHTl9VUCAoc2l6 ZW9mICgqZWhkcikgKyBwaG51bSAqIHNpemVvZiAoKnBoZHIpCiAJCQkgICsgc2hudW0gKiBzaXpl b2YgKCpzaGRyKSArIHN0cmluZ19zaXplLCBsYXlvdXQtPmFsaWduKTsKQEAgLTM5OSw2ICszOTks MzkgQEAgU1VGRklYIChncnViX21raW1hZ2VfZ2VuZXJhdGVfZWxmKSAoY29uc3Qgc3RydWN0IGdy dWJfaW5zdGFsbF9pbWFnZV90YXJnZXRfZGVzYwogICAgICAgcGhkci0+cF9vZmZzZXQgPSBncnVi X2hvc3RfdG9fdGFyZ2V0MzIgKGhlYWRlcl9zaXplICsgcHJvZ3JhbV9zaXplKTsKICAgICB9CiAK KyAgaWYgKGltYWdlX3RhcmdldC0+aWQgPT0gSU1BR0VfWEVOUFZIKQorICAgIHsKKyAgICAgIGNo YXIgKm5vdGVfc3RhcnQgPSAoZWxmX2ltZyArIHByb2dyYW1fc2l6ZSArIGhlYWRlcl9zaXplKTsK KyAgICAgIEVsZl9OaGRyICpub3RlX3B0cjsKKyAgICAgIGNoYXIgKnB0ciA9IChjaGFyICopIG5v dGVfc3RhcnQ7CisKKyAgICAgIGdydWJfdXRpbF9pbmZvICgiYWRkaW5nIFhFTiBOT1RFIHNlZ21l bnQiKTsKKworICAgICAgLyogUGh5czMyIEVudHJ5LiAgKi8KKyAgICAgIG5vdGVfcHRyID0gKEVs Zl9OaGRyICopIHB0cjsKKyAgICAgIG5vdGVfcHRyLT5uX25hbWVzeiA9IGdydWJfaG9zdF90b190 YXJnZXQzMiAoc2l6ZW9mIChHUlVCX1hFTl9OT1RFX05BTUUpKTsKKyAgICAgIG5vdGVfcHRyLT5u X2Rlc2NzeiA9IGdydWJfaG9zdF90b190YXJnZXQzMiAoaW1hZ2VfdGFyZ2V0LT52b2lkcF9zaXpl b2YpOworICAgICAgbm90ZV9wdHItPm5fdHlwZSA9IGdydWJfaG9zdF90b190YXJnZXQzMiAoMTgp OworICAgICAgcHRyICs9IHNpemVvZiAoRWxmX05oZHIpOworICAgICAgbWVtY3B5IChwdHIsIEdS VUJfWEVOX05PVEVfTkFNRSwgc2l6ZW9mIChHUlVCX1hFTl9OT1RFX05BTUUpKTsKKyAgICAgIHB0 ciArPSBBTElHTl9VUCAoc2l6ZW9mIChHUlVCX1hFTl9OT1RFX05BTUUpLCA0KTsKKyAgICAgIG1l bXNldCAocHRyLCAwLCBpbWFnZV90YXJnZXQtPnZvaWRwX3NpemVvZik7CisgICAgICAqKGdydWJf dWludDMyX3QgKikgcHRyID0gR1JVQl9LRVJORUxfSTM4Nl9YRU5QVkhfTElOS19BRERSOworICAg ICAgcHRyICs9IGltYWdlX3RhcmdldC0+dm9pZHBfc2l6ZW9mOworCisgICAgICBhc3NlcnQgKFhF TlBWSF9OT1RFX1NJWkUgPT0gKHB0ciAtIG5vdGVfc3RhcnQpKTsKKworICAgICAgcGhkcisrOwor ICAgICAgcGhkci0+cF90eXBlID0gZ3J1Yl9ob3N0X3RvX3RhcmdldDMyIChQVF9OT1RFKTsKKyAg ICAgIHBoZHItPnBfZmxhZ3MgPSBncnViX2hvc3RfdG9fdGFyZ2V0MzIgKFBGX1IpOworICAgICAg cGhkci0+cF9hbGlnbiA9IGdydWJfaG9zdF90b190YXJnZXQzMiAoaW1hZ2VfdGFyZ2V0LT52b2lk cF9zaXplb2YpOworICAgICAgcGhkci0+cF92YWRkciA9IDA7CisgICAgICBwaGRyLT5wX3BhZGRy ID0gMDsKKyAgICAgIHBoZHItPnBfZmlsZXN6ID0gZ3J1Yl9ob3N0X3RvX3RhcmdldDMyIChYRU5Q VkhfTk9URV9TSVpFKTsKKyAgICAgIHBoZHItPnBfbWVtc3ogPSAwOworICAgICAgcGhkci0+cF9v ZmZzZXQgPSBncnViX2hvc3RfdG9fdGFyZ2V0MzIgKGhlYWRlcl9zaXplICsgcHJvZ3JhbV9zaXpl KTsKKyAgICB9CisKICAgaWYgKG5vdGUpCiAgICAgewogICAgICAgaW50IG5vdGVfc2l6ZSA9IHNp emVvZiAoc3RydWN0IGdydWJfaWVlZTEyNzVfbm90ZSk7CkBAIC00NzQsNyArNTA3LDcgQEAgU1VG RklYIChncnViX21raW1hZ2VfZ2VuZXJhdGVfZWxmKSAoY29uc3Qgc3RydWN0IGdydWJfaW5zdGFs bF9pbWFnZV90YXJnZXRfZGVzYwogICAgIHNoZHItPnNoX2VudHNpemUgPSBncnViX2hvc3RfdG9f dGFyZ2V0MzIgKDApOwogICAgIHNoZHIrKzsKIAotICAgIGlmIChpbWFnZV90YXJnZXQtPmlkID09 IElNQUdFX1hFTikKKyAgICBpZiAoaW1hZ2VfdGFyZ2V0LT5pZCA9PSBJTUFHRV9YRU4gfHwgaW1h Z2VfdGFyZ2V0LT5pZCA9PSBJTUFHRV9YRU5QVkgpCiAgICAgICB7CiAJbWVtY3B5IChwdHIsICIu eGVuIiwgc2l6ZW9mICgiLnhlbiIpKTsKIAlzaGRyLT5zaF9uYW1lID0gZ3J1Yl9ob3N0X3RvX3Rh cmdldDMyIChwdHIgLSBzdHJfc3RhcnQpOwpAQCAtNDgyLDcgKzUxNSwxMCBAQCBTVUZGSVggKGdy dWJfbWtpbWFnZV9nZW5lcmF0ZV9lbGYpIChjb25zdCBzdHJ1Y3QgZ3J1Yl9pbnN0YWxsX2ltYWdl X3RhcmdldF9kZXNjCiAJc2hkci0+c2hfdHlwZSA9IGdydWJfaG9zdF90b190YXJnZXQzMiAoU0hU X1BST0dCSVRTKTsKIAlzaGRyLT5zaF9hZGRyID0gZ3J1Yl9ob3N0X3RvX3RhcmdldF9hZGRyICh0 YXJnZXRfYWRkciArIGxheW91dC0+a2VybmVsX3NpemUpOwogCXNoZHItPnNoX29mZnNldCA9IGdy dWJfaG9zdF90b190YXJnZXRfYWRkciAocHJvZ3JhbV9zaXplICsgaGVhZGVyX3NpemUpOwotCXNo ZHItPnNoX3NpemUgPSBncnViX2hvc3RfdG9fdGFyZ2V0MzIgKFhFTl9OT1RFX1NJWkUpOworCWlm IChpbWFnZV90YXJnZXQtPmlkID09IElNQUdFX1hFTikKKwkgIHNoZHItPnNoX3NpemUgPSBncnVi X2hvc3RfdG9fdGFyZ2V0MzIgKFhFTl9OT1RFX1NJWkUpOworCWVsc2UKKwkgIHNoZHItPnNoX3Np emUgPSBncnViX2hvc3RfdG9fdGFyZ2V0MzIgKFhFTlBWSF9OT1RFX1NJWkUpOwogCXNoZHItPnNo X2xpbmsgPSBncnViX2hvc3RfdG9fdGFyZ2V0MzIgKDApOwogCXNoZHItPnNoX2luZm8gPSBncnVi X2hvc3RfdG9fdGFyZ2V0MzIgKDApOwogCXNoZHItPnNoX2FkZHJhbGlnbiA9IGdydWJfaG9zdF90 b190YXJnZXQzMiAoaW1hZ2VfdGFyZ2V0LT52b2lkcF9zaXplb2YpOwpkaWZmIC0tZ2l0IGEvdXRp bC9ta2ltYWdlLmMgYi91dGlsL21raW1hZ2UuYwppbmRleCBlMjJkODJhZmEuLjVlMDcxYzA3NCAx MDA2NDQKLS0tIGEvdXRpbC9ta2ltYWdlLmMKKysrIGIvdXRpbC9ta2ltYWdlLmMKQEAgLTEzMyw2 ICsxMzMsMjQgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBncnViX2luc3RhbGxfaW1hZ2VfdGFyZ2V0 X2Rlc2MgaW1hZ2VfdGFyZ2V0c1tdID0KICAgICAgIC5kZWZhdWx0X2NvbXByZXNzaW9uID0gR1JV Ql9DT01QUkVTU0lPTl9MWk1BCiAgICAgfSwKICAgICB7CisgICAgICAuZGlybmFtZSA9ICJpMzg2 LXhlbnB2aCIsCisgICAgICAubmFtZXMgPSB7ICJpMzg2LXhlbnB2aCIsIE5VTEwgfSwKKyAgICAg IC52b2lkcF9zaXplb2YgPSA0LAorICAgICAgLmJpZ2VuZGlhbiA9IDAsCisgICAgICAuaWQgPSBJ TUFHRV9YRU5QVkgsCisgICAgICAuZmxhZ3MgPSBQTEFURk9STV9GTEFHU19OT05FLAorICAgICAg LnRvdGFsX21vZHVsZV9zaXplID0gVEFSR0VUX05PX0ZJRUxELAorICAgICAgLmRlY29tcHJlc3Nv cl9jb21wcmVzc2VkX3NpemUgPSBUQVJHRVRfTk9fRklFTEQsCisgICAgICAuZGVjb21wcmVzc29y X3VuY29tcHJlc3NlZF9zaXplID0gVEFSR0VUX05PX0ZJRUxELAorICAgICAgLmRlY29tcHJlc3Nv cl91bmNvbXByZXNzZWRfYWRkciA9IFRBUkdFVF9OT19GSUVMRCwKKyAgICAgIC5lbGZfdGFyZ2V0 ID0gRU1fMzg2LAorICAgICAgLnNlY3Rpb25fYWxpZ24gPSAxLAorICAgICAgLnZhZGRyX29mZnNl dCA9IDAsCisgICAgICAubGlua19hZGRyID0gR1JVQl9LRVJORUxfSTM4Nl9YRU5QVkhfTElOS19B RERSLAorICAgICAgLm1vZF9hbGlnbiA9IEdSVUJfS0VSTkVMX0kzODZfWEVOUFZIX01PRF9BTElH TiwKKyAgICAgIC5saW5rX2FsaWduID0gNAorICAgIH0sCisgICAgewogICAgICAgLmRpcm5hbWUg PSAiaTM4Ni1wYyIsCiAgICAgICAubmFtZXMgPSB7ICJpMzg2LXBjLXB4ZSIsIE5VTEwgfSwKICAg ICAgIC52b2lkcF9zaXplb2YgPSA0LApAQCAtODYwLDcgKzg3OCw4IEBAIGdydWJfaW5zdGFsbF9n ZW5lcmF0ZV9pbWFnZSAoY29uc3QgY2hhciAqZGlyLCBjb25zdCBjaGFyICpwcmVmaXgsCiAgIGVs c2UKICAgICBrZXJuZWxfaW1nID0gZ3J1Yl9ta2ltYWdlX2xvYWRfaW1hZ2U2NCAoa2VybmVsX3Bh dGgsIHRvdGFsX21vZHVsZV9zaXplLAogCQkJCQkgICAgJmxheW91dCwgaW1hZ2VfdGFyZ2V0KTsK LSAgaWYgKGltYWdlX3RhcmdldC0+aWQgPT0gSU1BR0VfWEVOICYmIGxheW91dC5hbGlnbiA8IDQw OTYpCisgIGlmICgoaW1hZ2VfdGFyZ2V0LT5pZCA9PSBJTUFHRV9YRU4gfHwgaW1hZ2VfdGFyZ2V0 LT5pZCA9PSBJTUFHRV9YRU5QVkgpICYmCisgICAgICBsYXlvdXQuYWxpZ24gPCA0MDk2KQogICAg IGxheW91dC5hbGlnbiA9IDQwOTY7CiAKICAgaWYgKChpbWFnZV90YXJnZXQtPmZsYWdzICYgUExB VEZPUk1fRkxBR1NfREVDT01QUkVTU09SUykKQEAgLTExMDMsNiArMTEyMiw3IEBAIGdydWJfaW5z dGFsbF9nZW5lcmF0ZV9pbWFnZSAoY29uc3QgY2hhciAqZGlyLCBjb25zdCBjaGFyICpwcmVmaXgs CiAgICAgY2FzZSBJTUFHRV9NSVBTX0FSQzoKICAgICBjYXNlIElNQUdFX1FFTVVfTUlQU19GTEFT SDoKICAgICBjYXNlIElNQUdFX1hFTjoKKyAgICBjYXNlIElNQUdFX1hFTlBWSDoKICAgICAgIGJy ZWFrOwogICAgIGNhc2UgSU1BR0VfU1BBUkM2NF9BT1VUOgogICAgIGNhc2UgSU1BR0VfU1BBUkM2 NF9SQVc6CkBAIC0xNjc5LDYgKzE2OTksNyBAQCBncnViX2luc3RhbGxfZ2VuZXJhdGVfaW1hZ2Ug KGNvbnN0IGNoYXIgKmRpciwgY29uc3QgY2hhciAqcHJlZml4LAogICAgIGNhc2UgSU1BR0VfTE9P TkdTT05fRUxGOgogICAgIGNhc2UgSU1BR0VfUFBDOgogICAgIGNhc2UgSU1BR0VfWEVOOgorICAg IGNhc2UgSU1BR0VfWEVOUFZIOgogICAgIGNhc2UgSU1BR0VfQ09SRUJPT1Q6CiAgICAgY2FzZSBJ TUFHRV9JMzg2X0lFRUUxMjc1OgogICAgICAgewotLSAKMi4xMi4zCgoKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApY ZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9y Zy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==