From: Juergen Gross <jgross@suse.com>
Subject: [PATCH v4 06/19] xen: rearrange xen/init.c to prepare
 it for Xen PVH mode
Date: Fri,  2 Nov 2018 13:37:25 +0100
Message-ID: <20181102123738.16395-7-jgross@suse.com>
References: <20181102123738.16395-1-jgross@suse.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <xen-devel-bounces@lists.xenproject.org>
In-Reply-To: <20181102123738.16395-1-jgross@suse.com>
List-Unsubscribe: <https://lists.xenproject.org/mailman/options/xen-devel>,
 <mailto:xen-devel-request@lists.xenproject.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xenproject.org>
List-Help: <mailto:xen-devel-request@lists.xenproject.org?subject=help>
List-Subscribe: <https://lists.xenproject.org/mailman/listinfo/xen-devel>,
 <mailto:xen-devel-request@lists.xenproject.org?subject=subscribe>
Errors-To: xen-devel-bounces@lists.xenproject.org
Sender: "Xen-devel" <xen-devel-bounces@lists.xenproject.org>
To: grub-devel@gnu.org
Cc: hans@knorrie.org, phcoder@gmail.com, daniel.kiper@oracle.com, Juergen Gross <jgross@suse.com>, xen-devel@lists.xen.org
List-Id: xen-devel@lists.xenproject.org

UmVhcnJhbmdlIGdydWItY29yZS9rZXJuL3hlbi9pbml0LmMgdG8gcHJlcGFyZSBhZGRpbmcgUFZI
IG1vZGUgc3VwcG9ydAp0byBpdC4gVGhpcyBpbmNsdWRlcyBwdXR0aW5nIHNvbWUgY29kZSB1bmRl
ciAjaWZkZWYgR1JVQl9NQUNISU5FX1hFTgphcyBpdCB3aWxsIG5vdCBiZSB1c2VkIHdoZW4gcnVu
bmluZyBhcyBQVkguCgpTaWduZWQtb2ZmLWJ5OiBKdWVyZ2VuIEdyb3NzIDxqZ3Jvc3NAc3VzZS5j
b20+ClJldmlld2VkLWJ5OiBEYW5pZWwgS2lwZXIgPGRhbmllbC5raXBlckBvcmFjbGUuY29tPgot
LS0KIGdydWItY29yZS9rZXJuL3hlbi9pbml0LmMgfCA2MCArKysrKysrKysrKysrKysrKysrKysr
KysrKystLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDM0IGluc2VydGlvbnMo
KyksIDI2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dydWItY29yZS9rZXJuL3hlbi9pbml0
LmMgYi9ncnViLWNvcmUva2Vybi94ZW4vaW5pdC5jCmluZGV4IDI5ZjViYzIzZC4uMTAwMDdiNDEx
IDEwMDY0NAotLS0gYS9ncnViLWNvcmUva2Vybi94ZW4vaW5pdC5jCisrKyBiL2dydWItY29yZS9r
ZXJuL3hlbi9pbml0LmMKQEAgLTQxLDkgKzQxLDExIEBAIGdydWJfc2l6ZV90IGdydWJfeGVuX25f
YWxsb2NhdGVkX3NoYXJlZF9wYWdlczsKIHN0YXRpYyBncnViX3hlbl9tZm5fdAogZ3J1Yl94ZW5f
cHRyMm1mbiAodm9pZCAqcHRyKQogeworI2lmZGVmIEdSVUJfTUFDSElORV9YRU4KICAgZ3J1Yl94
ZW5fbWZuX3QgKm1mbl9saXN0ID0KICAgICAoZ3J1Yl94ZW5fbWZuX3QgKikgZ3J1Yl94ZW5fc3Rh
cnRfcGFnZV9hZGRyLT5tZm5fbGlzdDsKICAgcmV0dXJuIG1mbl9saXN0WyhncnViX2FkZHJfdCkg
cHRyID4+IEdSVUJfWEVOX0xPR19QQUdFX1NJWkVdOworI2VuZGlmCiB9CiAKIHZvaWQgKgpAQCAt
MTA0LDE4ICsxMDYsNiBAQCBncnViX21hY2hpbmVfZ2V0X2Jvb3Rsb2NhdGlvbiAoY2hhciAqKmRl
dmljZSBfX2F0dHJpYnV0ZV9fICgodW51c2VkKSksCiB7CiB9CiAKLXN0YXRpYyBncnViX3VpbnQ4
X3Qgd2luZG93W0dSVUJfWEVOX1BBR0VfU0laRV0KLSAgX19hdHRyaWJ1dGVfXyAoKGFsaWduZWQg
KEdSVUJfWEVOX1BBR0VfU0laRSkpKTsKLQotI2lmZGVmIF9feDg2XzY0X18KLSNkZWZpbmUgTlVN
QkVSX09GX0xFVkVMUyA0Ci0jZWxzZQotI2RlZmluZSBOVU1CRVJfT0ZfTEVWRUxTIDMKLSNlbmRp
ZgotCi0jZGVmaW5lIExPR19QT0lOVEVSU19QRVJfUEFHRSA5Ci0jZGVmaW5lIFBPSU5URVJTX1BF
Ul9QQUdFICgxIDw8IExPR19QT0lOVEVSU19QRVJfUEFHRSkKLQogdm9pZAogZ3J1Yl94ZW5fc3Rv
cmVfc2VuZCAoY29uc3Qgdm9pZCAqYnVmXywgZ3J1Yl9zaXplX3QgbGVuKQogewpAQCAtMzM3LDYg
KzMyNywxOSBAQCBncnViX3hlbl9zZXR1cF9nbnR0YWIgKHZvaWQpCiAgIGdydWJfeGVuX2dyYW50
X3RhYmxlX29wIChHTlRUQUJPUF9zZXR1cF90YWJsZSwgJmdudHRhYl9zZXR1cCwgMSk7CiB9CiAK
KyNpZmRlZiBHUlVCX01BQ0hJTkVfWEVOCitzdGF0aWMgZ3J1Yl91aW50OF90IHdpbmRvd1tHUlVC
X1hFTl9QQUdFX1NJWkVdCisgIF9fYXR0cmlidXRlX18gKChhbGlnbmVkIChHUlVCX1hFTl9QQUdF
X1NJWkUpKSk7CisKKyNpZmRlZiBfX3g4Nl82NF9fCisjZGVmaW5lIE5VTUJFUl9PRl9MRVZFTFMg
NAorI2Vsc2UKKyNkZWZpbmUgTlVNQkVSX09GX0xFVkVMUyAzCisjZW5kaWYKKworI2RlZmluZSBM
T0dfUE9JTlRFUlNfUEVSX1BBR0UgOQorI2RlZmluZSBQT0lOVEVSU19QRVJfUEFHRSAoMSA8PCBM
T0dfUE9JTlRFUlNfUEVSX1BBR0UpCisKICNkZWZpbmUgTUFYX05fVU5VU0FCTEVfUEFHRVMgNAog
CiBzdGF0aWMgaW50CkBAIC01MjksMTMgKzUzMiwzMCBAQCBtYXBfYWxsX3BhZ2VzICh2b2lkKQog
ICBncnViX21tX2luaXRfcmVnaW9uICgodm9pZCAqKSBoZWFwX3N0YXJ0LCBoZWFwX2VuZCAtIGhl
YXBfc3RhcnQpOwogfQogCitncnViX2Vycl90CitncnViX21hY2hpbmVfbW1hcF9pdGVyYXRlIChn
cnViX21lbW9yeV9ob29rX3QgaG9vaywgdm9pZCAqaG9va19kYXRhKQoreworICBncnViX3VpbnQ2
NF90IHRvdGFsX3BhZ2VzID0gZ3J1Yl94ZW5fc3RhcnRfcGFnZV9hZGRyLT5ucl9wYWdlczsKKyAg
Z3J1Yl91aW50NjRfdCB1c2FibGVfcGFnZXMgPSBncnViX3hlbl9zdGFydF9wYWdlX2FkZHItPnB0
X2Jhc2UgPj4gMTI7CisgIGlmIChob29rICgwLCBwYWdlMm9mZnNldCAodXNhYmxlX3BhZ2VzKSwg
R1JVQl9NRU1PUllfQVZBSUxBQkxFLCBob29rX2RhdGEpKQorICAgIHJldHVybiBHUlVCX0VSUl9O
T05FOworCisgIGhvb2sgKHBhZ2Uyb2Zmc2V0ICh1c2FibGVfcGFnZXMpLCBwYWdlMm9mZnNldCAo
dG90YWxfcGFnZXMgLSB1c2FibGVfcGFnZXMpLAorCUdSVUJfTUVNT1JZX1JFU0VSVkVELCBob29r
X2RhdGEpOworCisgIHJldHVybiBHUlVCX0VSUl9OT05FOworfQorI2VuZGlmCisKIGV4dGVybiBj
aGFyIF9lbmRbXTsKIAogdm9pZAogZ3J1Yl9tYWNoaW5lX2luaXQgKHZvaWQpCiB7CisjaWZkZWYg
R1JVQl9NQUNISU5FX1hFTgogI2lmZGVmIF9faTM4Nl9fCiAgIGdydWJfeGVuX3ZtX2Fzc2lzdCAo
Vk1BU1NUX0NNRF9lbmFibGUsIFZNQVNTVF9UWVBFX3BhZV9leHRlbmRlZF9jcjMpOworI2VuZGlm
CiAjZW5kaWYKIAogICBncnViX21vZGJhc2UgPSBBTElHTl9VUCAoKGdydWJfYWRkcl90KSBfZW5k
CkBAIC01NDQsNyArNTY0LDkgQEAgZ3J1Yl9tYWNoaW5lX2luaXQgKHZvaWQpCiAKICAgZ3J1Yl94
ZW5fc2V0dXBfZ250dGFiICgpOwogCisjaWZkZWYgR1JVQl9NQUNISU5FX1hFTgogICBtYXBfYWxs
X3BhZ2VzICgpOworI2VuZGlmCiAKICAgZ3J1Yl9jb25zb2xlX2luaXQgKCk7CiAKQEAgLTU3MSwx
NyArNTkzLDMgQEAgZ3J1Yl9tYWNoaW5lX2ZpbmkgKGludCBmbGFncyBfX2F0dHJpYnV0ZV9fICgo
dW51c2VkKSkpCiAgIGdydWJfeGVuZGlza19maW5pICgpOwogICBncnViX2Jvb3RfZmluaSAoKTsK
IH0KLQotZ3J1Yl9lcnJfdAotZ3J1Yl9tYWNoaW5lX21tYXBfaXRlcmF0ZSAoZ3J1Yl9tZW1vcnlf
aG9va190IGhvb2ssIHZvaWQgKmhvb2tfZGF0YSkKLXsKLSAgZ3J1Yl91aW50NjRfdCB0b3RhbF9w
YWdlcyA9IGdydWJfeGVuX3N0YXJ0X3BhZ2VfYWRkci0+bnJfcGFnZXM7Ci0gIGdydWJfdWludDY0
X3QgdXNhYmxlX3BhZ2VzID0gZ3J1Yl94ZW5fc3RhcnRfcGFnZV9hZGRyLT5wdF9iYXNlID4+IDEy
OwotICBpZiAoaG9vayAoMCwgcGFnZTJvZmZzZXQgKHVzYWJsZV9wYWdlcyksIEdSVUJfTUVNT1JZ
X0FWQUlMQUJMRSwgaG9va19kYXRhKSkKLSAgICByZXR1cm4gR1JVQl9FUlJfTk9ORTsKLQotICBo
b29rIChwYWdlMm9mZnNldCAodXNhYmxlX3BhZ2VzKSwgcGFnZTJvZmZzZXQgKHRvdGFsX3BhZ2Vz
IC0gdXNhYmxlX3BhZ2VzKSwKLQlHUlVCX01FTU9SWV9SRVNFUlZFRCwgaG9va19kYXRhKTsKLQot
ICByZXR1cm4gR1JVQl9FUlJfTk9ORTsKLX0KLS0gCjIuMTYuNAoKCl9fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVu
LWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcv
bWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw=