From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Kiper <daniel.kiper@oracle.com>
Subject: [PATCH v6 03/15] x86/boot/reloc: rename some variables
	and rearrange code a bit
Date: Mon, 12 Sep 2016 22:18:18 +0200
Message-ID: <1473711511-11931-4-git-send-email-daniel.kiper@oracle.com>
References: <1473711511-11931-1-git-send-email-daniel.kiper@oracle.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta3.messagelabs.com ([195.245.230.39])
 by lists.xenproject.org with esmtp (Exim 4.84_2)
 (envelope-from <daniel.kiper@oracle.com>) id 1bjXjP-00065q-6B
 for xen-devel@lists.xenproject.org; Mon, 12 Sep 2016 20:21:31 +0000
In-Reply-To: <1473711511-11931-1-git-send-email-daniel.kiper@oracle.com>
List-Unsubscribe: <https://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
 <mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <https://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
 <mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Errors-To: xen-devel-bounces@lists.xen.org
Sender: "Xen-devel" <xen-devel-bounces@lists.xen.org>
To: xen-devel@lists.xenproject.org
Cc: jgross@suse.com, sstabellini@kernel.org, andrew.cooper3@citrix.com, cardoe@cardoe.com, pgnet.dev@gmail.com, ning.sun@intel.com, david.vrabel@citrix.com, jbeulich@suse.com, qiaowei.ren@intel.com, gang.wei@intel.com, fu.wei@linaro.org
List-Id: xen-devel@lists.xenproject.org

UmVwbGFjZSBtYmkgd2l0aCBtYmlfb3V0IGFuZCBtYmlfb2xkIHdpdGggbWJpX2luIGFuZCByZWFy
cmFuZ2UgY29kZQphIGJpdCB0byBtYWtlIGl0IG1vcmUgcmVhZGFibGUuIEFkZGl0aW9uYWxseSwg
dGhpcyB3YXkgbXVsdGlib290ICh2MSkKcHJvdG9jb2wgaW1wbGVtZW50YXRpb24gYW5kIGZ1dHVy
ZSBtdWx0aWJvb3QyIHByb3RvY29sIGltcGxlbWVudGF0aW9uCndpbGwgdXNlIHRoZSBzYW1lIHZh
cmlhYmxlIG5hbWluZyBjb252ZW50aW9uLgoKU2lnbmVkLW9mZi1ieTogRGFuaWVsIEtpcGVyIDxk
YW5pZWwua2lwZXJAb3JhY2xlLmNvbT4KQWNrZWQtYnk6IEphbiBCZXVsaWNoIDxqYmV1bGljaEBz
dXNlLmNvbT4KLS0tCnY0IC0gc3VnZ2VzdGlvbnMvZml4ZXM6CiAgIC0gbW92ZSB0byBzdGRjYWxs
IGNhbGxpbmcgY29udmVudGlvbi4KCnYzIC0gc3VnZ2VzdGlvbnMvZml4ZXM6CiAgIC0gaW1wcm92
ZSBjb21taXQgbWVzc2FnZQogICAgIChzdWdnZXN0ZWQgYnkgS29ucmFkIFJ6ZXN6dXRlayBXaWxr
KS4KCnYyIC0gc3VnZ2VzdGlvbnMvZml4ZXM6CiAgIC0gZXh0cmFjdCB0aGlzIGNoYW5nZSBmcm9t
IG1haW4gbXV0bGlib290MgogICAgIHByb3RvY29sIGltcGxlbWVudGF0aW9uCiAgICAgKHN1Z2dl
c3RlZCBieSBKYW4gQmV1bGljaCkuCi0tLQogeGVuL2FyY2gveDg2L2Jvb3QvcmVsb2MuYyB8ICAg
MzkgKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdl
ZCwgMjAgaW5zZXJ0aW9ucygrKSwgMTkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2Fy
Y2gveDg2L2Jvb3QvcmVsb2MuYyBiL3hlbi9hcmNoL3g4Ni9ib290L3JlbG9jLmMKaW5kZXggOTA1
M2UyYy4uZWE4Y2IzNyAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L2Jvb3QvcmVsb2MuYworKysg
Yi94ZW4vYXJjaC94ODYvYm9vdC9yZWxvYy5jCkBAIC02NSw0NSArNjUsNDYgQEAgc3RhdGljIHUz
MiBjb3B5X3N0cmluZyh1MzIgc3JjKQogICAgIHJldHVybiBjb3B5X21lbShzcmMsIHAgLSBzcmMg
KyAxKTsKIH0KIAotbXVsdGlib290X2luZm9fdCBfX3N0ZGNhbGwgKnJlbG9jKHUzMiBtYmlfb2xk
LCB1MzIgdHJhbXBvbGluZSkKK211bHRpYm9vdF9pbmZvX3QgX19zdGRjYWxsICpyZWxvYyh1MzIg
bWJpX2luLCB1MzIgdHJhbXBvbGluZSkKIHsKLSAgICBtdWx0aWJvb3RfaW5mb190ICptYmk7CiAg
ICAgaW50IGk7CisgICAgbXVsdGlib290X2luZm9fdCAqbWJpX291dDsKIAogICAgIGFsbG9jID0g
dHJhbXBvbGluZTsKIAotICAgIG1iaSA9IF9wKGNvcHlfbWVtKG1iaV9vbGQsIHNpemVvZigqbWJp
KSkpOworICAgIG1iaV9vdXQgPSBfcChjb3B5X21lbShtYmlfaW4sIHNpemVvZigqbWJpX291dCkp
KTsKIAotICAgIGlmICggbWJpLT5mbGFncyAmIE1CSV9DTURMSU5FICkKLSAgICAgICAgbWJpLT5j
bWRsaW5lID0gY29weV9zdHJpbmcobWJpLT5jbWRsaW5lKTsKKyAgICBpZiAoIG1iaV9vdXQtPmZs
YWdzICYgTUJJX0NNRExJTkUgKQorICAgICAgICBtYmlfb3V0LT5jbWRsaW5lID0gY29weV9zdHJp
bmcobWJpX291dC0+Y21kbGluZSk7CiAKLSAgICBpZiAoIG1iaS0+ZmxhZ3MgJiBNQklfTU9EVUxF
UyApCisgICAgaWYgKCBtYmlfb3V0LT5mbGFncyAmIE1CSV9NT0RVTEVTICkKICAgICB7CiAgICAg
ICAgIG1vZHVsZV90ICptb2RzOwogCi0gICAgICAgIG1iaS0+bW9kc19hZGRyID0gY29weV9tZW0o
bWJpLT5tb2RzX2FkZHIsIG1iaS0+bW9kc19jb3VudCAqIHNpemVvZihtb2R1bGVfdCkpOworICAg
ICAgICBtYmlfb3V0LT5tb2RzX2FkZHIgPSBjb3B5X21lbShtYmlfb3V0LT5tb2RzX2FkZHIsCisg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1iaV9vdXQtPm1vZHNfY291bnQg
KiBzaXplb2YobW9kdWxlX3QpKTsKIAotICAgICAgICBtb2RzID0gX3AobWJpLT5tb2RzX2FkZHIp
OworICAgICAgICBtb2RzID0gX3AobWJpX291dC0+bW9kc19hZGRyKTsKIAotICAgICAgICBmb3Ig
KCBpID0gMDsgaSA8IG1iaS0+bW9kc19jb3VudDsgaSsrICkKKyAgICAgICAgZm9yICggaSA9IDA7
IGkgPCBtYmlfb3V0LT5tb2RzX2NvdW50OyBpKysgKQogICAgICAgICB7CiAgICAgICAgICAgICBp
ZiAoIG1vZHNbaV0uc3RyaW5nICkKICAgICAgICAgICAgICAgICBtb2RzW2ldLnN0cmluZyA9IGNv
cHlfc3RyaW5nKG1vZHNbaV0uc3RyaW5nKTsKICAgICAgICAgfQogICAgIH0KIAotICAgIGlmICgg
bWJpLT5mbGFncyAmIE1CSV9NRU1NQVAgKQotICAgICAgICBtYmktPm1tYXBfYWRkciA9IGNvcHlf
bWVtKG1iaS0+bW1hcF9hZGRyLCBtYmktPm1tYXBfbGVuZ3RoKTsKKyAgICBpZiAoIG1iaV9vdXQt
PmZsYWdzICYgTUJJX01FTU1BUCApCisgICAgICAgIG1iaV9vdXQtPm1tYXBfYWRkciA9IGNvcHlf
bWVtKG1iaV9vdXQtPm1tYXBfYWRkciwgbWJpX291dC0+bW1hcF9sZW5ndGgpOwogCi0gICAgaWYg
KCBtYmktPmZsYWdzICYgTUJJX0xPQURFUk5BTUUgKQotICAgICAgICBtYmktPmJvb3RfbG9hZGVy
X25hbWUgPSBjb3B5X3N0cmluZyhtYmktPmJvb3RfbG9hZGVyX25hbWUpOworICAgIGlmICggbWJp
X291dC0+ZmxhZ3MgJiBNQklfTE9BREVSTkFNRSApCisgICAgICAgIG1iaV9vdXQtPmJvb3RfbG9h
ZGVyX25hbWUgPSBjb3B5X3N0cmluZyhtYmlfb3V0LT5ib290X2xvYWRlcl9uYW1lKTsKIAogICAg
IC8qIE1hc2sgZmVhdHVyZXMgd2UgZG9uJ3QgdW5kZXJzdGFuZCBvciBkb24ndCByZWxvY2F0ZS4g
Ki8KLSAgICBtYmktPmZsYWdzICY9IChNQklfTUVNTElNSVRTIHwKLSAgICAgICAgICAgICAgICAg
ICBNQklfQ01ETElORSB8Ci0gICAgICAgICAgICAgICAgICAgTUJJX01PRFVMRVMgfAotICAgICAg
ICAgICAgICAgICAgIE1CSV9NRU1NQVAgfAotICAgICAgICAgICAgICAgICAgIE1CSV9MT0FERVJO
QU1FKTsKKyAgICBtYmlfb3V0LT5mbGFncyAmPSAoTUJJX01FTUxJTUlUUyB8CisgICAgICAgICAg
ICAgICAgICAgICAgIE1CSV9DTURMSU5FIHwKKyAgICAgICAgICAgICAgICAgICAgICAgTUJJX01P
RFVMRVMgfAorICAgICAgICAgICAgICAgICAgICAgICBNQklfTUVNTUFQIHwKKyAgICAgICAgICAg
ICAgICAgICAgICAgTUJJX0xPQURFUk5BTUUpOwogCi0gICAgcmV0dXJuIG1iaTsKKyAgICByZXR1
cm4gbWJpX291dDsKIH0KLS0gCjEuNy4xMC40CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlz
dHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==