From: Juergen Gross Subject: [PATCH v2 06/18] xen: rearrange xen/init.c to prepare it for Xen PVH mode Date: Tue, 9 Oct 2018 13:03:05 +0200 Message-ID: <20181009110317.6022-7-jgross@suse.com> References: <20181009110317.6022-1-jgross@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20181009110317.6022-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: hans@knorrie.org, phcoder@gmail.com, daniel.kiper@oracle.com, Juergen Gross , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org UmVhcnJhbmdlIGdydWItY29yZS9rZXJuL3hlbi9pbml0LmMgdG8gcHJlcGFyZSBhZGRpbmcgUFZI IG1vZGUgc3VwcG9ydAp0byBpdC4gVGhpcyBpbmNsdWRlcyBwdXR0aW5nIHNvbWUgY29kZSB1bmRl ciAjaWZkZWYgR1JVQl9NQUNISU5FX1hFTgphcyBpdCB3aWxsIG5vdCBiZSB1c2VkIHdoZW4gcnVu bmluZyBhcyBQVkguCgpTaWduZWQtb2ZmLWJ5OiBKdWVyZ2VuIEdyb3NzIDxqZ3Jvc3NAc3VzZS5j b20+Ci0tLQogZ3J1Yi1jb3JlL2tlcm4veGVuL2luaXQuYyB8IDYwICsrKysrKysrKysrKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMzQgaW5zZXJ0 aW9ucygrKSwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ3J1Yi1jb3JlL2tlcm4veGVu L2luaXQuYyBiL2dydWItY29yZS9rZXJuL3hlbi9pbml0LmMKaW5kZXggMjlmNWJjMjNkLi4xMDAw N2I0MTEgMTAwNjQ0Ci0tLSBhL2dydWItY29yZS9rZXJuL3hlbi9pbml0LmMKKysrIGIvZ3J1Yi1j b3JlL2tlcm4veGVuL2luaXQuYwpAQCAtNDEsOSArNDEsMTEgQEAgZ3J1Yl9zaXplX3QgZ3J1Yl94 ZW5fbl9hbGxvY2F0ZWRfc2hhcmVkX3BhZ2VzOwogc3RhdGljIGdydWJfeGVuX21mbl90CiBncnVi X3hlbl9wdHIybWZuICh2b2lkICpwdHIpCiB7CisjaWZkZWYgR1JVQl9NQUNISU5FX1hFTgogICBn cnViX3hlbl9tZm5fdCAqbWZuX2xpc3QgPQogICAgIChncnViX3hlbl9tZm5fdCAqKSBncnViX3hl bl9zdGFydF9wYWdlX2FkZHItPm1mbl9saXN0OwogICByZXR1cm4gbWZuX2xpc3RbKGdydWJfYWRk cl90KSBwdHIgPj4gR1JVQl9YRU5fTE9HX1BBR0VfU0laRV07CisjZW5kaWYKIH0KIAogdm9pZCAq CkBAIC0xMDQsMTggKzEwNiw2IEBAIGdydWJfbWFjaGluZV9nZXRfYm9vdGxvY2F0aW9uIChjaGFy ICoqZGV2aWNlIF9fYXR0cmlidXRlX18gKCh1bnVzZWQpKSwKIHsKIH0KIAotc3RhdGljIGdydWJf dWludDhfdCB3aW5kb3dbR1JVQl9YRU5fUEFHRV9TSVpFXQotICBfX2F0dHJpYnV0ZV9fICgoYWxp Z25lZCAoR1JVQl9YRU5fUEFHRV9TSVpFKSkpOwotCi0jaWZkZWYgX194ODZfNjRfXwotI2RlZmlu ZSBOVU1CRVJfT0ZfTEVWRUxTIDQKLSNlbHNlCi0jZGVmaW5lIE5VTUJFUl9PRl9MRVZFTFMgMwot I2VuZGlmCi0KLSNkZWZpbmUgTE9HX1BPSU5URVJTX1BFUl9QQUdFIDkKLSNkZWZpbmUgUE9JTlRF UlNfUEVSX1BBR0UgKDEgPDwgTE9HX1BPSU5URVJTX1BFUl9QQUdFKQotCiB2b2lkCiBncnViX3hl bl9zdG9yZV9zZW5kIChjb25zdCB2b2lkICpidWZfLCBncnViX3NpemVfdCBsZW4pCiB7CkBAIC0z MzcsNiArMzI3LDE5IEBAIGdydWJfeGVuX3NldHVwX2dudHRhYiAodm9pZCkKICAgZ3J1Yl94ZW5f Z3JhbnRfdGFibGVfb3AgKEdOVFRBQk9QX3NldHVwX3RhYmxlLCAmZ250dGFiX3NldHVwLCAxKTsK IH0KIAorI2lmZGVmIEdSVUJfTUFDSElORV9YRU4KK3N0YXRpYyBncnViX3VpbnQ4X3Qgd2luZG93 W0dSVUJfWEVOX1BBR0VfU0laRV0KKyAgX19hdHRyaWJ1dGVfXyAoKGFsaWduZWQgKEdSVUJfWEVO X1BBR0VfU0laRSkpKTsKKworI2lmZGVmIF9feDg2XzY0X18KKyNkZWZpbmUgTlVNQkVSX09GX0xF VkVMUyA0CisjZWxzZQorI2RlZmluZSBOVU1CRVJfT0ZfTEVWRUxTIDMKKyNlbmRpZgorCisjZGVm aW5lIExPR19QT0lOVEVSU19QRVJfUEFHRSA5CisjZGVmaW5lIFBPSU5URVJTX1BFUl9QQUdFICgx IDw8IExPR19QT0lOVEVSU19QRVJfUEFHRSkKKwogI2RlZmluZSBNQVhfTl9VTlVTQUJMRV9QQUdF UyA0CiAKIHN0YXRpYyBpbnQKQEAgLTUyOSwxMyArNTMyLDMwIEBAIG1hcF9hbGxfcGFnZXMgKHZv aWQpCiAgIGdydWJfbW1faW5pdF9yZWdpb24gKCh2b2lkICopIGhlYXBfc3RhcnQsIGhlYXBfZW5k IC0gaGVhcF9zdGFydCk7CiB9CiAKK2dydWJfZXJyX3QKK2dydWJfbWFjaGluZV9tbWFwX2l0ZXJh dGUgKGdydWJfbWVtb3J5X2hvb2tfdCBob29rLCB2b2lkICpob29rX2RhdGEpCit7CisgIGdydWJf dWludDY0X3QgdG90YWxfcGFnZXMgPSBncnViX3hlbl9zdGFydF9wYWdlX2FkZHItPm5yX3BhZ2Vz OworICBncnViX3VpbnQ2NF90IHVzYWJsZV9wYWdlcyA9IGdydWJfeGVuX3N0YXJ0X3BhZ2VfYWRk ci0+cHRfYmFzZSA+PiAxMjsKKyAgaWYgKGhvb2sgKDAsIHBhZ2Uyb2Zmc2V0ICh1c2FibGVfcGFn ZXMpLCBHUlVCX01FTU9SWV9BVkFJTEFCTEUsIGhvb2tfZGF0YSkpCisgICAgcmV0dXJuIEdSVUJf RVJSX05PTkU7CisKKyAgaG9vayAocGFnZTJvZmZzZXQgKHVzYWJsZV9wYWdlcyksIHBhZ2Uyb2Zm c2V0ICh0b3RhbF9wYWdlcyAtIHVzYWJsZV9wYWdlcyksCisJR1JVQl9NRU1PUllfUkVTRVJWRUQs IGhvb2tfZGF0YSk7CisKKyAgcmV0dXJuIEdSVUJfRVJSX05PTkU7Cit9CisjZW5kaWYKKwogZXh0 ZXJuIGNoYXIgX2VuZFtdOwogCiB2b2lkCiBncnViX21hY2hpbmVfaW5pdCAodm9pZCkKIHsKKyNp ZmRlZiBHUlVCX01BQ0hJTkVfWEVOCiAjaWZkZWYgX19pMzg2X18KICAgZ3J1Yl94ZW5fdm1fYXNz aXN0IChWTUFTU1RfQ01EX2VuYWJsZSwgVk1BU1NUX1RZUEVfcGFlX2V4dGVuZGVkX2NyMyk7Cisj ZW5kaWYKICNlbmRpZgogCiAgIGdydWJfbW9kYmFzZSA9IEFMSUdOX1VQICgoZ3J1Yl9hZGRyX3Qp IF9lbmQKQEAgLTU0NCw3ICs1NjQsOSBAQCBncnViX21hY2hpbmVfaW5pdCAodm9pZCkKIAogICBn cnViX3hlbl9zZXR1cF9nbnR0YWIgKCk7CiAKKyNpZmRlZiBHUlVCX01BQ0hJTkVfWEVOCiAgIG1h cF9hbGxfcGFnZXMgKCk7CisjZW5kaWYKIAogICBncnViX2NvbnNvbGVfaW5pdCAoKTsKIApAQCAt NTcxLDE3ICs1OTMsMyBAQCBncnViX21hY2hpbmVfZmluaSAoaW50IGZsYWdzIF9fYXR0cmlidXRl X18gKCh1bnVzZWQpKSkKICAgZ3J1Yl94ZW5kaXNrX2ZpbmkgKCk7CiAgIGdydWJfYm9vdF9maW5p ICgpOwogfQotCi1ncnViX2Vycl90Ci1ncnViX21hY2hpbmVfbW1hcF9pdGVyYXRlIChncnViX21l bW9yeV9ob29rX3QgaG9vaywgdm9pZCAqaG9va19kYXRhKQotewotICBncnViX3VpbnQ2NF90IHRv dGFsX3BhZ2VzID0gZ3J1Yl94ZW5fc3RhcnRfcGFnZV9hZGRyLT5ucl9wYWdlczsKLSAgZ3J1Yl91 aW50NjRfdCB1c2FibGVfcGFnZXMgPSBncnViX3hlbl9zdGFydF9wYWdlX2FkZHItPnB0X2Jhc2Ug Pj4gMTI7Ci0gIGlmIChob29rICgwLCBwYWdlMm9mZnNldCAodXNhYmxlX3BhZ2VzKSwgR1JVQl9N RU1PUllfQVZBSUxBQkxFLCBob29rX2RhdGEpKQotICAgIHJldHVybiBHUlVCX0VSUl9OT05FOwot Ci0gIGhvb2sgKHBhZ2Uyb2Zmc2V0ICh1c2FibGVfcGFnZXMpLCBwYWdlMm9mZnNldCAodG90YWxf cGFnZXMgLSB1c2FibGVfcGFnZXMpLAotCUdSVUJfTUVNT1JZX1JFU0VSVkVELCBob29rX2RhdGEp OwotCi0gIHJldHVybiBHUlVCX0VSUl9OT05FOwotfQotLSAKMi4xNi40CgoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlz dApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0 Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==