From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PULL for-2.10 4/7] xen: move physmap saving into a separate function Date: Tue, 18 Jul 2017 15:22:39 -0700 Message-ID: <1500416562-27337-4-git-send-email-sstabellini@kernel.org> References: <1500416562-27337-1-git-send-email-sstabellini@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dXatF-0006z2-Bw for xen-devel@lists.xenproject.org; Tue, 18 Jul 2017 22:22:49 +0000 In-Reply-To: <1500416562-27337-1-git-send-email-sstabellini@kernel.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: peter.maydell@linaro.org, stefanha@gmail.com Cc: Igor Druzhinin , sstabellini@kernel.org, qemu-devel@nongnu.org, stefanha@redhat.com, anthony.perard@citrix.com, xen-devel@lists.xenproject.org List-Id: xen-devel@lists.xenproject.org RnJvbTogSWdvciBEcnV6aGluaW4gPGlnb3IuZHJ1emhpbmluQGNpdHJpeC5jb20+CgpOb24tZnVu Y3Rpb25hbCBjaGFuZ2UuCgpTaWduZWQtb2ZmLWJ5OiBJZ29yIERydXpoaW5pbiA8aWdvci5kcnV6 aGluaW5AY2l0cml4LmNvbT4KUmV2aWV3ZWQtYnk6IFN0ZWZhbm8gU3RhYmVsbGluaSA8c3N0YWJl bGxpbmlAa2VybmVsLm9yZz4KUmV2aWV3ZWQtYnk6IFBhdWwgRHVycmFudCA8cGF1bC5kdXJyYW50 QGNpdHJpeC5jb20+Ci0tLQogaHcvaTM4Ni94ZW4veGVuLWh2bS5jIHwgNTcgKysrKysrKysrKysr KysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg MzEgaW5zZXJ0aW9ucygrKSwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvaHcvaTM4Ni94 ZW4veGVuLWh2bS5jIGIvaHcvaTM4Ni94ZW4veGVuLWh2bS5jCmluZGV4IDNkOTUxYTMuLjI3Nzkx OWUgMTAwNjQ0Ci0tLSBhL2h3L2kzODYveGVuL3hlbi1odm0uYworKysgYi9ody9pMzg2L3hlbi94 ZW4taHZtLmMKQEAgLTMwNCw2ICszMDQsMzYgQEAgc3RhdGljIGh3YWRkciB4ZW5fcGh5c19vZmZz ZXRfdG9fZ2FkZHIoaHdhZGRyIHN0YXJ0X2FkZHIsCiAgICAgcmV0dXJuIHN0YXJ0X2FkZHI7CiB9 CiAKK3N0YXRpYyBpbnQgeGVuX3NhdmVfcGh5c21hcChYZW5JT1N0YXRlICpzdGF0ZSwgWGVuUGh5 c21hcCAqcGh5c21hcCkKK3sKKyAgICBjaGFyIHBhdGhbODBdLCB2YWx1ZVsxN107CisKKyAgICBz bnByaW50ZihwYXRoLCBzaXplb2YocGF0aCksCisgICAgICAgICAgICAiL2xvY2FsL2RvbWFpbi8w L2RldmljZS1tb2RlbC8lZC9waHlzbWFwLyUiUFJJeDY0Ii9zdGFydF9hZGRyIiwKKyAgICAgICAg ICAgIHhlbl9kb21pZCwgKHVpbnQ2NF90KXBoeXNtYXAtPnBoeXNfb2Zmc2V0KTsKKyAgICBzbnBy aW50Zih2YWx1ZSwgc2l6ZW9mKHZhbHVlKSwgIiUiUFJJeDY0LCAodWludDY0X3QpcGh5c21hcC0+ c3RhcnRfYWRkcik7CisgICAgaWYgKCF4c193cml0ZShzdGF0ZS0+eGVuc3RvcmUsIDAsIHBhdGgs IHZhbHVlLCBzdHJsZW4odmFsdWUpKSkgeworICAgICAgICByZXR1cm4gLTE7CisgICAgfQorICAg IHNucHJpbnRmKHBhdGgsIHNpemVvZihwYXRoKSwKKyAgICAgICAgICAgICIvbG9jYWwvZG9tYWlu LzAvZGV2aWNlLW1vZGVsLyVkL3BoeXNtYXAvJSJQUkl4NjQiL3NpemUiLAorICAgICAgICAgICAg eGVuX2RvbWlkLCAodWludDY0X3QpcGh5c21hcC0+cGh5c19vZmZzZXQpOworICAgIHNucHJpbnRm KHZhbHVlLCBzaXplb2YodmFsdWUpLCAiJSJQUkl4NjQsICh1aW50NjRfdClwaHlzbWFwLT5zaXpl KTsKKyAgICBpZiAoIXhzX3dyaXRlKHN0YXRlLT54ZW5zdG9yZSwgMCwgcGF0aCwgdmFsdWUsIHN0 cmxlbih2YWx1ZSkpKSB7CisgICAgICAgIHJldHVybiAtMTsKKyAgICB9CisgICAgaWYgKHBoeXNt YXAtPm5hbWUpIHsKKyAgICAgICAgc25wcmludGYocGF0aCwgc2l6ZW9mKHBhdGgpLAorICAgICAg ICAgICAgICAgICIvbG9jYWwvZG9tYWluLzAvZGV2aWNlLW1vZGVsLyVkL3BoeXNtYXAvJSJQUkl4 NjQiL25hbWUiLAorICAgICAgICAgICAgICAgIHhlbl9kb21pZCwgKHVpbnQ2NF90KXBoeXNtYXAt PnBoeXNfb2Zmc2V0KTsKKyAgICAgICAgaWYgKCF4c193cml0ZShzdGF0ZS0+eGVuc3RvcmUsIDAs IHBhdGgsCisgICAgICAgICAgICAgICAgICAgICAgcGh5c21hcC0+bmFtZSwgc3RybGVuKHBoeXNt YXAtPm5hbWUpKSkgeworICAgICAgICAgICAgcmV0dXJuIC0xOworICAgICAgICB9CisgICAgfQor ICAgIHJldHVybiAwOworfQorCiBzdGF0aWMgaW50IHhlbl9hZGRfdG9fcGh5c21hcChYZW5JT1N0 YXRlICpzdGF0ZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGh3YWRkciBzdGFydF9h ZGRyLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmFtX2FkZHJfdCBzaXplLApAQCAt MzE1LDcgKzM0NSw2IEBAIHN0YXRpYyBpbnQgeGVuX2FkZF90b19waHlzbWFwKFhlbklPU3RhdGUg KnN0YXRlLAogICAgIFhlblBoeXNtYXAgKnBoeXNtYXAgPSBOVUxMOwogICAgIGh3YWRkciBwZm4s IHN0YXJ0X2dwZm47CiAgICAgaHdhZGRyIHBoeXNfb2Zmc2V0ID0gbWVtb3J5X3JlZ2lvbl9nZXRf cmFtX2FkZHIobXIpOwotICAgIGNoYXIgcGF0aFs4MF0sIHZhbHVlWzE3XTsKICAgICBjb25zdCBj aGFyICptcl9uYW1lOwogCiAgICAgaWYgKGdldF9waHlzbWFwcGluZyhzdGF0ZSwgc3RhcnRfYWRk ciwgc2l6ZSkpIHsKQEAgLTM2NywzMSArMzk2LDcgQEAgZ29fcGh5c21hcDoKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc3RhcnRfYWRkciA+PiBUQVJHRVRfUEFHRV9CSVRTLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc3RhcnRfYWRkciArIHNpemUgLSAx KSA+PiBUQVJHRVRfUEFHRV9CSVRTLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBYRU5fRE9NQ1RMX01FTV9DQUNIRUFUVFJfV0IpOwotCi0gICAgc25wcmludGYocGF0aCwgc2l6 ZW9mKHBhdGgpLAotICAgICAgICAgICAgIi9sb2NhbC9kb21haW4vMC9kZXZpY2UtbW9kZWwvJWQv cGh5c21hcC8lIlBSSXg2NCIvc3RhcnRfYWRkciIsCi0gICAgICAgICAgICB4ZW5fZG9taWQsICh1 aW50NjRfdClwaHlzX29mZnNldCk7Ci0gICAgc25wcmludGYodmFsdWUsIHNpemVvZih2YWx1ZSks ICIlIlBSSXg2NCwgKHVpbnQ2NF90KXN0YXJ0X2FkZHIpOwotICAgIGlmICgheHNfd3JpdGUoc3Rh dGUtPnhlbnN0b3JlLCAwLCBwYXRoLCB2YWx1ZSwgc3RybGVuKHZhbHVlKSkpIHsKLSAgICAgICAg cmV0dXJuIC0xOwotICAgIH0KLSAgICBzbnByaW50ZihwYXRoLCBzaXplb2YocGF0aCksCi0gICAg ICAgICAgICAiL2xvY2FsL2RvbWFpbi8wL2RldmljZS1tb2RlbC8lZC9waHlzbWFwLyUiUFJJeDY0 Ii9zaXplIiwKLSAgICAgICAgICAgIHhlbl9kb21pZCwgKHVpbnQ2NF90KXBoeXNfb2Zmc2V0KTsK LSAgICBzbnByaW50Zih2YWx1ZSwgc2l6ZW9mKHZhbHVlKSwgIiUiUFJJeDY0LCAodWludDY0X3Qp c2l6ZSk7Ci0gICAgaWYgKCF4c193cml0ZShzdGF0ZS0+eGVuc3RvcmUsIDAsIHBhdGgsIHZhbHVl LCBzdHJsZW4odmFsdWUpKSkgewotICAgICAgICByZXR1cm4gLTE7Ci0gICAgfQotICAgIGlmICht cl9uYW1lKSB7Ci0gICAgICAgIHNucHJpbnRmKHBhdGgsIHNpemVvZihwYXRoKSwKLSAgICAgICAg ICAgICAgICAiL2xvY2FsL2RvbWFpbi8wL2RldmljZS1tb2RlbC8lZC9waHlzbWFwLyUiUFJJeDY0 Ii9uYW1lIiwKLSAgICAgICAgICAgICAgICB4ZW5fZG9taWQsICh1aW50NjRfdClwaHlzX29mZnNl dCk7Ci0gICAgICAgIGlmICgheHNfd3JpdGUoc3RhdGUtPnhlbnN0b3JlLCAwLCBwYXRoLCBtcl9u YW1lLCBzdHJsZW4obXJfbmFtZSkpKSB7Ci0gICAgICAgICAgICByZXR1cm4gLTE7Ci0gICAgICAg IH0KLSAgICB9Ci0KLSAgICByZXR1cm4gMDsKKyAgICByZXR1cm4geGVuX3NhdmVfcGh5c21hcChz dGF0ZSwgcGh5c21hcCk7CiB9CiAKIHN0YXRpYyBpbnQgeGVuX3JlbW92ZV9mcm9tX3BoeXNtYXAo WGVuSU9TdGF0ZSAqc3RhdGUsCi0tIAoxLjkuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxp c3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=