From mboxrd@z Thu Jan 1 00:00:00 1970 From: Igor Druzhinin Subject: [PATCH 1/4] xen: move physmap saving into a separate function Date: Fri, 30 Jun 2017 17:07:02 +0100 Message-ID: <1498838825-23701-2-git-send-email-igor.druzhinin@citrix.com> References: <1498838825-23701-1-git-send-email-igor.druzhinin@citrix.com> 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 1dQySO-0003hW-AW for xen-devel@lists.xenproject.org; Fri, 30 Jun 2017 16:07:44 +0000 In-Reply-To: <1498838825-23701-1-git-send-email-igor.druzhinin@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org, qemu-devel@nongnu.org Cc: anthony.perard@citrix.com, Igor Druzhinin , sstabellini@kernel.org, paul.durrant@citrix.com, pbonzini@redhat.com List-Id: xen-devel@lists.xenproject.org Tm9uLWZ1bmN0aW9uYWwgY2hhbmdlLgoKU2lnbmVkLW9mZi1ieTogSWdvciBEcnV6aGluaW4gPGln b3IuZHJ1emhpbmluQGNpdHJpeC5jb20+Ci0tLQogaHcvaTM4Ni94ZW4veGVuLWh2bS5jIHwgNTcg KysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZp bGUgY2hhbmdlZCwgMzEgaW5zZXJ0aW9ucygrKSwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvaHcvaTM4Ni94ZW4veGVuLWh2bS5jIGIvaHcvaTM4Ni94ZW4veGVuLWh2bS5jCmluZGV4IGNm ZmE3ZTIuLmQyNTljZjcgMTAwNjQ0Ci0tLSBhL2h3L2kzODYveGVuL3hlbi1odm0uYworKysgYi9o dy9pMzg2L3hlbi94ZW4taHZtLmMKQEAgLTMwNSw2ICszMDUsMzYgQEAgc3RhdGljIGh3YWRkciB4 ZW5fcGh5c19vZmZzZXRfdG9fZ2FkZHIoaHdhZGRyIHN0YXJ0X2FkZHIsCiAgICAgcmV0dXJuIHN0 YXJ0X2FkZHI7CiB9CiAKK3N0YXRpYyBpbnQgeGVuX3NhdmVfcGh5c21hcChYZW5JT1N0YXRlICpz dGF0ZSwgWGVuUGh5c21hcCAqcGh5c21hcCkKK3sKKyAgICBjaGFyIHBhdGhbODBdLCB2YWx1ZVsx N107CisKKyAgICBzbnByaW50ZihwYXRoLCBzaXplb2YocGF0aCksCisgICAgICAgICAgICAiL2xv Y2FsL2RvbWFpbi8wL2RldmljZS1tb2RlbC8lZC9waHlzbWFwLyUiUFJJeDY0Ii9zdGFydF9hZGRy IiwKKyAgICAgICAgICAgIHhlbl9kb21pZCwgKHVpbnQ2NF90KXBoeXNtYXAtPnBoeXNfb2Zmc2V0 KTsKKyAgICBzbnByaW50Zih2YWx1ZSwgc2l6ZW9mKHZhbHVlKSwgIiUiUFJJeDY0LCAodWludDY0 X3QpcGh5c21hcC0+c3RhcnRfYWRkcik7CisgICAgaWYgKCF4c193cml0ZShzdGF0ZS0+eGVuc3Rv cmUsIDAsIHBhdGgsIHZhbHVlLCBzdHJsZW4odmFsdWUpKSkgeworICAgICAgICByZXR1cm4gLTE7 CisgICAgfQorICAgIHNucHJpbnRmKHBhdGgsIHNpemVvZihwYXRoKSwKKyAgICAgICAgICAgICIv bG9jYWwvZG9tYWluLzAvZGV2aWNlLW1vZGVsLyVkL3BoeXNtYXAvJSJQUkl4NjQiL3NpemUiLAor ICAgICAgICAgICAgeGVuX2RvbWlkLCAodWludDY0X3QpcGh5c21hcC0+cGh5c19vZmZzZXQpOwor ICAgIHNucHJpbnRmKHZhbHVlLCBzaXplb2YodmFsdWUpLCAiJSJQUkl4NjQsICh1aW50NjRfdClw aHlzbWFwLT5zaXplKTsKKyAgICBpZiAoIXhzX3dyaXRlKHN0YXRlLT54ZW5zdG9yZSwgMCwgcGF0 aCwgdmFsdWUsIHN0cmxlbih2YWx1ZSkpKSB7CisgICAgICAgIHJldHVybiAtMTsKKyAgICB9Cisg ICAgaWYgKHBoeXNtYXAtPm5hbWUpIHsKKyAgICAgICAgc25wcmludGYocGF0aCwgc2l6ZW9mKHBh dGgpLAorICAgICAgICAgICAgICAgICIvbG9jYWwvZG9tYWluLzAvZGV2aWNlLW1vZGVsLyVkL3Bo eXNtYXAvJSJQUkl4NjQiL25hbWUiLAorICAgICAgICAgICAgICAgIHhlbl9kb21pZCwgKHVpbnQ2 NF90KXBoeXNtYXAtPnBoeXNfb2Zmc2V0KTsKKyAgICAgICAgaWYgKCF4c193cml0ZShzdGF0ZS0+ eGVuc3RvcmUsIDAsIHBhdGgsCisgICAgICAgICAgICAgICAgICAgICAgcGh5c21hcC0+bmFtZSwg c3RybGVuKHBoeXNtYXAtPm5hbWUpKSkgeworICAgICAgICAgICAgcmV0dXJuIC0xOworICAgICAg ICB9CisgICAgfQorICAgIHJldHVybiAwOworfQorCiBzdGF0aWMgaW50IHhlbl9hZGRfdG9fcGh5 c21hcChYZW5JT1N0YXRlICpzdGF0ZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGh3 YWRkciBzdGFydF9hZGRyLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmFtX2FkZHJf dCBzaXplLApAQCAtMzE2LDcgKzM0Niw2IEBAIHN0YXRpYyBpbnQgeGVuX2FkZF90b19waHlzbWFw KFhlbklPU3RhdGUgKnN0YXRlLAogICAgIFhlblBoeXNtYXAgKnBoeXNtYXAgPSBOVUxMOwogICAg IGh3YWRkciBwZm4sIHN0YXJ0X2dwZm47CiAgICAgaHdhZGRyIHBoeXNfb2Zmc2V0ID0gbWVtb3J5 X3JlZ2lvbl9nZXRfcmFtX2FkZHIobXIpOwotICAgIGNoYXIgcGF0aFs4MF0sIHZhbHVlWzE3XTsK ICAgICBjb25zdCBjaGFyICptcl9uYW1lOwogCiAgICAgaWYgKGdldF9waHlzbWFwcGluZyhzdGF0 ZSwgc3RhcnRfYWRkciwgc2l6ZSkpIHsKQEAgLTM2OCwzMSArMzk3LDcgQEAgZ29fcGh5c21hcDoK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RhcnRfYWRkciA+PiBUQVJHRVRf UEFHRV9CSVRTLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc3RhcnRfYWRk ciArIHNpemUgLSAxKSA+PiBUQVJHRVRfUEFHRV9CSVRTLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBYRU5fRE9NQ1RMX01FTV9DQUNIRUFUVFJfV0IpOwotCi0gICAgc25wcmlu dGYocGF0aCwgc2l6ZW9mKHBhdGgpLAotICAgICAgICAgICAgIi9sb2NhbC9kb21haW4vMC9kZXZp Y2UtbW9kZWwvJWQvcGh5c21hcC8lIlBSSXg2NCIvc3RhcnRfYWRkciIsCi0gICAgICAgICAgICB4 ZW5fZG9taWQsICh1aW50NjRfdClwaHlzX29mZnNldCk7Ci0gICAgc25wcmludGYodmFsdWUsIHNp emVvZih2YWx1ZSksICIlIlBSSXg2NCwgKHVpbnQ2NF90KXN0YXJ0X2FkZHIpOwotICAgIGlmICgh eHNfd3JpdGUoc3RhdGUtPnhlbnN0b3JlLCAwLCBwYXRoLCB2YWx1ZSwgc3RybGVuKHZhbHVlKSkp IHsKLSAgICAgICAgcmV0dXJuIC0xOwotICAgIH0KLSAgICBzbnByaW50ZihwYXRoLCBzaXplb2Yo cGF0aCksCi0gICAgICAgICAgICAiL2xvY2FsL2RvbWFpbi8wL2RldmljZS1tb2RlbC8lZC9waHlz bWFwLyUiUFJJeDY0Ii9zaXplIiwKLSAgICAgICAgICAgIHhlbl9kb21pZCwgKHVpbnQ2NF90KXBo eXNfb2Zmc2V0KTsKLSAgICBzbnByaW50Zih2YWx1ZSwgc2l6ZW9mKHZhbHVlKSwgIiUiUFJJeDY0 LCAodWludDY0X3Qpc2l6ZSk7Ci0gICAgaWYgKCF4c193cml0ZShzdGF0ZS0+eGVuc3RvcmUsIDAs IHBhdGgsIHZhbHVlLCBzdHJsZW4odmFsdWUpKSkgewotICAgICAgICByZXR1cm4gLTE7Ci0gICAg fQotICAgIGlmIChtcl9uYW1lKSB7Ci0gICAgICAgIHNucHJpbnRmKHBhdGgsIHNpemVvZihwYXRo KSwKLSAgICAgICAgICAgICAgICAiL2xvY2FsL2RvbWFpbi8wL2RldmljZS1tb2RlbC8lZC9waHlz bWFwLyUiUFJJeDY0Ii9uYW1lIiwKLSAgICAgICAgICAgICAgICB4ZW5fZG9taWQsICh1aW50NjRf dClwaHlzX29mZnNldCk7Ci0gICAgICAgIGlmICgheHNfd3JpdGUoc3RhdGUtPnhlbnN0b3JlLCAw LCBwYXRoLCBtcl9uYW1lLCBzdHJsZW4obXJfbmFtZSkpKSB7Ci0gICAgICAgICAgICByZXR1cm4g LTE7Ci0gICAgICAgIH0KLSAgICB9Ci0KLSAgICByZXR1cm4gMDsKKyAgICByZXR1cm4geGVuX3Nh dmVfcGh5c21hcChzdGF0ZSwgcGh5c21hcCk7CiB9CiAKIHN0YXRpYyBpbnQgeGVuX3JlbW92ZV9m cm9tX3BoeXNtYXAoWGVuSU9TdGF0ZSAqc3RhdGUsCi0tIAoyLjcuNAoKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QK WGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=