From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Kiper <daniel.kiper@oracle.com>
Subject: [PATCH v3 06/16] x86/boot/reloc: Rename some variables
	and rearrange code a bit
Date: Fri, 15 Apr 2016 14:33:06 +0200
Message-ID: <1460723596-13261-7-git-send-email-daniel.kiper@oracle.com>
References: <1460723596-13261-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 1ar2wq-0005Ba-7k
 for xen-devel@lists.xenproject.org; Fri, 15 Apr 2016 12:34:08 +0000
In-Reply-To: <1460723596-13261-1-git-send-email-daniel.kiper@oracle.com>
List-Unsubscribe: <http://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: <http://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, andrew.cooper3@citrix.com, stefano.stabellini@eu.citrix.com, cardoe@cardoe.com, pgnet.dev@gmail.com, ning.sun@intel.com, david.vrabel@citrix.com, jbeulich@suse.com, qiaowei.ren@intel.com, richard.l.maliszewski@intel.com, gang.wei@intel.com, fu.wei@linaro.org
List-Id: xen-devel@lists.xenproject.org

UmVwbGFjZSBtYmkgd2l0aCBtYmlfb3V0IGFuZCBtYmlfb2xkIHdpdGggbWJpX2luIGFuZCByZWFy
cmFuZ2UgY29kZQphIGJpdCB0byBtYWtlIGl0IG1vcmUgcmVhZGFibGUuIEFkZGl0aW9uYWxseSwg
dGhpcyB3YXkgbXVsdGlib290ICh2MSkKcHJvdG9jb2wgaW1wbGVtZW50YXRpb24gYW5kIGZ1dHVy
ZSBtdWx0aWJvb3QyIHByb3RvY29sIGltcGxlbWVudGF0aW9uCndpbGwgdXNlIHRoZSBzYW1lIHZh
cmlhYmxlIG5hbWluZyBjb252ZW50aW9uLgoKU2lnbmVkLW9mZi1ieTogRGFuaWVsIEtpcGVyIDxk
YW5pZWwua2lwZXJAb3JhY2xlLmNvbT4KUmV2aWV3ZWQtYnk6IEtvbnJhZCBSemVzenV0ZWsgV2ls
ayA8a29ucmFkLndpbGtAb3JhY2xlLmNvbT4KQWNrZWQtYnk6IEphbiBCZXVsaWNoIDxqYmV1bGlj
aEBzdXNlLmNvbT4KLS0tCnYzIC0gc3VnZ2VzdGlvbnMvZml4ZXM6CiAgIC0gaW1wcm92ZSBjb21t
aXQgbWVzc2FnZQogICAgIChzdWdnZXN0ZWQgYnkgS29ucmFkIFJ6ZXN6dXRlayBXaWxrKS4KCnYy
IC0gc3VnZ2VzdGlvbnMvZml4ZXM6CiAgIC0gZXh0cmFjdCB0aGlzIGNoYW5nZSBmcm9tIG1haW4g
bXV0bGlib290MgogICAgIHByb3RvY29sIGltcGxlbWVudGF0aW9uCiAgICAgKHN1Z2dlc3RlZCBi
eSBKYW4gQmV1bGljaCkuCi0tLQogeGVuL2FyY2gveDg2L2Jvb3QvcmVsb2MuYyB8ICAgMzkgKysr
KysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjEg
aW5zZXJ0aW9ucygrKSwgMTggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2
L2Jvb3QvcmVsb2MuYyBiL3hlbi9hcmNoL3g4Ni9ib290L3JlbG9jLmMKaW5kZXggZDYwYTA3OC4u
OTNiMzg0NSAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L2Jvb3QvcmVsb2MuYworKysgYi94ZW4v
YXJjaC94ODYvYm9vdC9yZWxvYy5jCkBAIC04NCw0MSArODQsNDQgQEAgc3RhdGljIHUzMiBjb3B5
X3N0cmluZyh1MzIgc3JjKQogICAgIHJldHVybiBjb3B5X21lbShzcmMsIHAgLSBzcmMgKyAxKTsK
IH0KIAotbXVsdGlib290X2luZm9fdCAqcmVsb2ModTMyIG1iaV9vbGQpCittdWx0aWJvb3RfaW5m
b190ICpyZWxvYyh1MzIgbWJpX2luKQogewotICAgIG11bHRpYm9vdF9pbmZvX3QgKm1iaSA9ICht
dWx0aWJvb3RfaW5mb190ICopY29weV9tZW0obWJpX29sZCwgc2l6ZW9mKCptYmkpKTsKICAgICBp
bnQgaTsKKyAgICBtdWx0aWJvb3RfaW5mb190ICptYmlfb3V0OwogCi0gICAgaWYgKCBtYmktPmZs
YWdzICYgTUJJX0NNRExJTkUgKQotICAgICAgICBtYmktPmNtZGxpbmUgPSBjb3B5X3N0cmluZyht
YmktPmNtZGxpbmUpOworICAgIG1iaV9vdXQgPSAobXVsdGlib290X2luZm9fdCAqKWNvcHlfbWVt
KG1iaV9pbiwgc2l6ZW9mKCptYmlfb3V0KSk7CiAKLSAgICBpZiAoIG1iaS0+ZmxhZ3MgJiBNQklf
TU9EVUxFUyApCisgICAgaWYgKCBtYmlfb3V0LT5mbGFncyAmIE1CSV9DTURMSU5FICkKKyAgICAg
ICAgbWJpX291dC0+Y21kbGluZSA9IGNvcHlfc3RyaW5nKG1iaV9vdXQtPmNtZGxpbmUpOworCisg
ICAgaWYgKCBtYmlfb3V0LT5mbGFncyAmIE1CSV9NT0RVTEVTICkKICAgICB7CiAgICAgICAgIG1v
ZHVsZV90ICptb2RzOwogCi0gICAgICAgIG1iaS0+bW9kc19hZGRyID0gY29weV9tZW0obWJpLT5t
b2RzX2FkZHIsIG1iaS0+bW9kc19jb3VudCAqIHNpemVvZihtb2R1bGVfdCkpOworICAgICAgICBt
Ymlfb3V0LT5tb2RzX2FkZHIgPSBjb3B5X21lbShtYmlfb3V0LT5tb2RzX2FkZHIsCisgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1iaV9vdXQtPm1vZHNfY291bnQgKiBzaXpl
b2YobW9kdWxlX3QpKTsKIAotICAgICAgICBtb2RzID0gKG1vZHVsZV90ICopbWJpLT5tb2RzX2Fk
ZHI7CisgICAgICAgIG1vZHMgPSAobW9kdWxlX3QgKiltYmlfb3V0LT5tb2RzX2FkZHI7CiAKLSAg
ICAgICAgZm9yICggaSA9IDA7IGkgPCBtYmktPm1vZHNfY291bnQ7IGkrKyApCisgICAgICAgIGZv
ciAoIGkgPSAwOyBpIDwgbWJpX291dC0+bW9kc19jb3VudDsgaSsrICkKICAgICAgICAgewogICAg
ICAgICAgICAgaWYgKCBtb2RzW2ldLnN0cmluZyApCiAgICAgICAgICAgICAgICAgbW9kc1tpXS5z
dHJpbmcgPSBjb3B5X3N0cmluZyhtb2RzW2ldLnN0cmluZyk7CiAgICAgICAgIH0KICAgICB9CiAK
LSAgICBpZiAoIG1iaS0+ZmxhZ3MgJiBNQklfTUVNTUFQICkKLSAgICAgICAgbWJpLT5tbWFwX2Fk
ZHIgPSBjb3B5X21lbShtYmktPm1tYXBfYWRkciwgbWJpLT5tbWFwX2xlbmd0aCk7CisgICAgaWYg
KCBtYmlfb3V0LT5mbGFncyAmIE1CSV9NRU1NQVAgKQorICAgICAgICBtYmlfb3V0LT5tbWFwX2Fk
ZHIgPSBjb3B5X21lbShtYmlfb3V0LT5tbWFwX2FkZHIsIG1iaV9vdXQtPm1tYXBfbGVuZ3RoKTsK
IAotICAgIGlmICggbWJpLT5mbGFncyAmIE1CSV9MT0FERVJOQU1FICkKLSAgICAgICAgbWJpLT5i
b290X2xvYWRlcl9uYW1lID0gY29weV9zdHJpbmcobWJpLT5ib290X2xvYWRlcl9uYW1lKTsKKyAg
ICBpZiAoIG1iaV9vdXQtPmZsYWdzICYgTUJJX0xPQURFUk5BTUUgKQorICAgICAgICBtYmlfb3V0
LT5ib290X2xvYWRlcl9uYW1lID0gY29weV9zdHJpbmcobWJpX291dC0+Ym9vdF9sb2FkZXJfbmFt
ZSk7CiAKICAgICAvKiBNYXNrIGZlYXR1cmVzIHdlIGRvbid0IHVuZGVyc3RhbmQgb3IgZG9uJ3Qg
cmVsb2NhdGUuICovCi0gICAgbWJpLT5mbGFncyAmPSAoTUJJX01FTUxJTUlUUyB8Ci0gICAgICAg
ICAgICAgICAgICAgTUJJX0NNRExJTkUgfAotICAgICAgICAgICAgICAgICAgIE1CSV9NT0RVTEVT
IHwKLSAgICAgICAgICAgICAgICAgICBNQklfTUVNTUFQIHwKLSAgICAgICAgICAgICAgICAgICBN
QklfTE9BREVSTkFNRSk7CisgICAgbWJpX291dC0+ZmxhZ3MgJj0gKE1CSV9NRU1MSU1JVFMgfAor
ICAgICAgICAgICAgICAgICAgICAgICBNQklfQ01ETElORSB8CisgICAgICAgICAgICAgICAgICAg
ICAgIE1CSV9NT0RVTEVTIHwKKyAgICAgICAgICAgICAgICAgICAgICAgTUJJX01FTU1BUCB8Cisg
ICAgICAgICAgICAgICAgICAgICAgIE1CSV9MT0FERVJOQU1FKTsKIAotICAgIHJldHVybiBtYmk7
CisgICAgcmV0dXJuIG1iaV9vdXQ7CiB9Ci0tIAoxLjcuMTAuNAoKCl9fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVu
LWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==