From mboxrd@z Thu Jan 1 00:00:00 1970 From: Igor Druzhinin Subject: [PATCH v3 1/4] xen: move physmap saving into a separate function Date: Mon, 10 Jul 2017 23:40:00 +0100 Message-ID: <1499726403-10129-2-git-send-email-igor.druzhinin@citrix.com> References: <1499726403-10129-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.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dUhLt-0007AI-8r for xen-devel@lists.xenproject.org; Mon, 10 Jul 2017 22:40:25 +0000 In-Reply-To: <1499726403-10129-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+ClJldmlld2VkLWJ5OiBTdGVmYW5vIFN0YWJlbGxpbmkg PHNzdGFiZWxsaW5pQGtlcm5lbC5vcmc+ClJldmlld2VkLWJ5OiBQYXVsIER1cnJhbnQgPHBhdWwu ZHVycmFudEBjaXRyaXguY29tPgotLS0KIGh3L2kzODYveGVuL3hlbi1odm0uYyB8IDU3ICsrKysr KysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDMxIGluc2VydGlvbnMoKyksIDI2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2h3 L2kzODYveGVuL3hlbi1odm0uYyBiL2h3L2kzODYveGVuL3hlbi1odm0uYwppbmRleCBjZmZhN2Uy Li5kMjU5Y2Y3IDEwMDY0NAotLS0gYS9ody9pMzg2L3hlbi94ZW4taHZtLmMKKysrIGIvaHcvaTM4 Ni94ZW4veGVuLWh2bS5jCkBAIC0zMDUsNiArMzA1LDM2IEBAIHN0YXRpYyBod2FkZHIgeGVuX3Bo eXNfb2Zmc2V0X3RvX2dhZGRyKGh3YWRkciBzdGFydF9hZGRyLAogICAgIHJldHVybiBzdGFydF9h ZGRyOwogfQogCitzdGF0aWMgaW50IHhlbl9zYXZlX3BoeXNtYXAoWGVuSU9TdGF0ZSAqc3RhdGUs IFhlblBoeXNtYXAgKnBoeXNtYXApCit7CisgICAgY2hhciBwYXRoWzgwXSwgdmFsdWVbMTddOwor CisgICAgc25wcmludGYocGF0aCwgc2l6ZW9mKHBhdGgpLAorICAgICAgICAgICAgIi9sb2NhbC9k b21haW4vMC9kZXZpY2UtbW9kZWwvJWQvcGh5c21hcC8lIlBSSXg2NCIvc3RhcnRfYWRkciIsCisg ICAgICAgICAgICB4ZW5fZG9taWQsICh1aW50NjRfdClwaHlzbWFwLT5waHlzX29mZnNldCk7Cisg ICAgc25wcmludGYodmFsdWUsIHNpemVvZih2YWx1ZSksICIlIlBSSXg2NCwgKHVpbnQ2NF90KXBo eXNtYXAtPnN0YXJ0X2FkZHIpOworICAgIGlmICgheHNfd3JpdGUoc3RhdGUtPnhlbnN0b3JlLCAw LCBwYXRoLCB2YWx1ZSwgc3RybGVuKHZhbHVlKSkpIHsKKyAgICAgICAgcmV0dXJuIC0xOworICAg IH0KKyAgICBzbnByaW50ZihwYXRoLCBzaXplb2YocGF0aCksCisgICAgICAgICAgICAiL2xvY2Fs L2RvbWFpbi8wL2RldmljZS1tb2RlbC8lZC9waHlzbWFwLyUiUFJJeDY0Ii9zaXplIiwKKyAgICAg ICAgICAgIHhlbl9kb21pZCwgKHVpbnQ2NF90KXBoeXNtYXAtPnBoeXNfb2Zmc2V0KTsKKyAgICBz bnByaW50Zih2YWx1ZSwgc2l6ZW9mKHZhbHVlKSwgIiUiUFJJeDY0LCAodWludDY0X3QpcGh5c21h cC0+c2l6ZSk7CisgICAgaWYgKCF4c193cml0ZShzdGF0ZS0+eGVuc3RvcmUsIDAsIHBhdGgsIHZh bHVlLCBzdHJsZW4odmFsdWUpKSkgeworICAgICAgICByZXR1cm4gLTE7CisgICAgfQorICAgIGlm IChwaHlzbWFwLT5uYW1lKSB7CisgICAgICAgIHNucHJpbnRmKHBhdGgsIHNpemVvZihwYXRoKSwK KyAgICAgICAgICAgICAgICAiL2xvY2FsL2RvbWFpbi8wL2RldmljZS1tb2RlbC8lZC9waHlzbWFw LyUiUFJJeDY0Ii9uYW1lIiwKKyAgICAgICAgICAgICAgICB4ZW5fZG9taWQsICh1aW50NjRfdClw aHlzbWFwLT5waHlzX29mZnNldCk7CisgICAgICAgIGlmICgheHNfd3JpdGUoc3RhdGUtPnhlbnN0 b3JlLCAwLCBwYXRoLAorICAgICAgICAgICAgICAgICAgICAgIHBoeXNtYXAtPm5hbWUsIHN0cmxl bihwaHlzbWFwLT5uYW1lKSkpIHsKKyAgICAgICAgICAgIHJldHVybiAtMTsKKyAgICAgICAgfQor ICAgIH0KKyAgICByZXR1cm4gMDsKK30KKwogc3RhdGljIGludCB4ZW5fYWRkX3RvX3BoeXNtYXAo WGVuSU9TdGF0ZSAqc3RhdGUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBod2FkZHIg c3RhcnRfYWRkciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJhbV9hZGRyX3Qgc2l6 ZSwKQEAgLTMxNiw3ICszNDYsNiBAQCBzdGF0aWMgaW50IHhlbl9hZGRfdG9fcGh5c21hcChYZW5J T1N0YXRlICpzdGF0ZSwKICAgICBYZW5QaHlzbWFwICpwaHlzbWFwID0gTlVMTDsKICAgICBod2Fk ZHIgcGZuLCBzdGFydF9ncGZuOwogICAgIGh3YWRkciBwaHlzX29mZnNldCA9IG1lbW9yeV9yZWdp b25fZ2V0X3JhbV9hZGRyKG1yKTsKLSAgICBjaGFyIHBhdGhbODBdLCB2YWx1ZVsxN107CiAgICAg Y29uc3QgY2hhciAqbXJfbmFtZTsKIAogICAgIGlmIChnZXRfcGh5c21hcHBpbmcoc3RhdGUsIHN0 YXJ0X2FkZHIsIHNpemUpKSB7CkBAIC0zNjgsMzEgKzM5Nyw3IEBAIGdvX3BoeXNtYXA6CiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXJ0X2FkZHIgPj4gVEFSR0VUX1BBR0Vf QklUUywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0YXJ0X2FkZHIgKyBz aXplIC0gMSkgPj4gVEFSR0VUX1BBR0VfQklUUywKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgWEVOX0RPTUNUTF9NRU1fQ0FDSEVBVFRSX1dCKTsKLQotICAgIHNucHJpbnRmKHBh dGgsIHNpemVvZihwYXRoKSwKLSAgICAgICAgICAgICIvbG9jYWwvZG9tYWluLzAvZGV2aWNlLW1v ZGVsLyVkL3BoeXNtYXAvJSJQUkl4NjQiL3N0YXJ0X2FkZHIiLAotICAgICAgICAgICAgeGVuX2Rv bWlkLCAodWludDY0X3QpcGh5c19vZmZzZXQpOwotICAgIHNucHJpbnRmKHZhbHVlLCBzaXplb2Yo dmFsdWUpLCAiJSJQUkl4NjQsICh1aW50NjRfdClzdGFydF9hZGRyKTsKLSAgICBpZiAoIXhzX3dy aXRlKHN0YXRlLT54ZW5zdG9yZSwgMCwgcGF0aCwgdmFsdWUsIHN0cmxlbih2YWx1ZSkpKSB7Ci0g ICAgICAgIHJldHVybiAtMTsKLSAgICB9Ci0gICAgc25wcmludGYocGF0aCwgc2l6ZW9mKHBhdGgp LAotICAgICAgICAgICAgIi9sb2NhbC9kb21haW4vMC9kZXZpY2UtbW9kZWwvJWQvcGh5c21hcC8l IlBSSXg2NCIvc2l6ZSIsCi0gICAgICAgICAgICB4ZW5fZG9taWQsICh1aW50NjRfdClwaHlzX29m ZnNldCk7Ci0gICAgc25wcmludGYodmFsdWUsIHNpemVvZih2YWx1ZSksICIlIlBSSXg2NCwgKHVp bnQ2NF90KXNpemUpOwotICAgIGlmICgheHNfd3JpdGUoc3RhdGUtPnhlbnN0b3JlLCAwLCBwYXRo LCB2YWx1ZSwgc3RybGVuKHZhbHVlKSkpIHsKLSAgICAgICAgcmV0dXJuIC0xOwotICAgIH0KLSAg ICBpZiAobXJfbmFtZSkgewotICAgICAgICBzbnByaW50ZihwYXRoLCBzaXplb2YocGF0aCksCi0g ICAgICAgICAgICAgICAgIi9sb2NhbC9kb21haW4vMC9kZXZpY2UtbW9kZWwvJWQvcGh5c21hcC8l IlBSSXg2NCIvbmFtZSIsCi0gICAgICAgICAgICAgICAgeGVuX2RvbWlkLCAodWludDY0X3QpcGh5 c19vZmZzZXQpOwotICAgICAgICBpZiAoIXhzX3dyaXRlKHN0YXRlLT54ZW5zdG9yZSwgMCwgcGF0 aCwgbXJfbmFtZSwgc3RybGVuKG1yX25hbWUpKSkgewotICAgICAgICAgICAgcmV0dXJuIC0xOwot ICAgICAgICB9Ci0gICAgfQotCi0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIHhlbl9zYXZlX3Bo eXNtYXAoc3RhdGUsIHBoeXNtYXApOwogfQogCiBzdGF0aWMgaW50IHhlbl9yZW1vdmVfZnJvbV9w aHlzbWFwKFhlbklPU3RhdGUgKnN0YXRlLAotLSAKMi43LjQKCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1k ZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK