From mboxrd@z Thu Jan 1 00:00:00 1970 From: Igor Druzhinin Subject: [PATCH v2 4/4] xen: don't use xenstore to save/restore physmap anymore Date: Tue, 4 Jul 2017 16:47:47 +0100 Message-ID: <1499183267-28623-5-git-send-email-igor.druzhinin@citrix.com> References: <1499183267-28623-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 1dSQ3q-0003MX-Rj for xen-devel@lists.xenproject.org; Tue, 04 Jul 2017 15:48:22 +0000 In-Reply-To: <1499183267-28623-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 SWYgd2UgaGF2ZSBhIHN5c3RlbSB3aXRoIHhlbmZvcmVpZ25tZW1vcnlfbWFwMigpIGltcGxlbWVu dGVkCndlIGRvbid0IG5lZWQgdG8gc2F2ZS9yZXN0b3JlIHBoeXNtYXAgb24gc3VzcGVuZC9yZXN0 b3JlCmFueW1vcmUuIEluIGNhc2Ugd2UgcmVzdW1lIGEgVk0gd2l0aG91dCBwaHlzbWFwIC0gdHJ5 IHRvCnJlY3JlYXRlIHRoZSBwaHlzbWFwIGR1cmluZyBtZW1vcnkgcmVnaW9uIHJlc3RvcmUgcGhh c2UgYW5kCnJlbWFwIG1hcCBjYWNoZSBlbnRyaWVzIGFjY29yZGluZ2x5LiBUaGUgb2xkIGNvZGUg aXMgbGVmdApmb3IgY29tcGF0aWJpbGl0eSByZWFzb25zLgoKU2lnbmVkLW9mZi1ieTogSWdvciBE cnV6aGluaW4gPGlnb3IuZHJ1emhpbmluQGNpdHJpeC5jb20+Ci0tLQogaHcvaTM4Ni94ZW4veGVu LWh2bS5jICAgICAgIHwgNDggKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0t LS0tLS0tCiBpbmNsdWRlL2h3L3hlbi94ZW5fY29tbW9uLmggfCAgMSArCiAyIGZpbGVzIGNoYW5n ZWQsIDM4IGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2h3L2kz ODYveGVuL3hlbi1odm0uYyBiL2h3L2kzODYveGVuL3hlbi1odm0uYwppbmRleCBkMjU5Y2Y3Li5k MjRjYTQ3IDEwMDY0NAotLS0gYS9ody9pMzg2L3hlbi94ZW4taHZtLmMKKysrIGIvaHcvaTM4Ni94 ZW4veGVuLWh2bS5jCkBAIC0yODksNiArMjg5LDcgQEAgc3RhdGljIFhlblBoeXNtYXAgKmdldF9w aHlzbWFwcGluZyhYZW5JT1N0YXRlICpzdGF0ZSwKICAgICByZXR1cm4gTlVMTDsKIH0KIAorI2lm ZGVmIFhFTl9DT01QQVRfUEhZU01BUAogc3RhdGljIGh3YWRkciB4ZW5fcGh5c19vZmZzZXRfdG9f Z2FkZHIoaHdhZGRyIHN0YXJ0X2FkZHIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICByYW1fYWRkcl90IHNpemUsIHZvaWQgKm9wYXF1ZSkKIHsKQEAg LTMzNCw2ICszMzUsMTIgQEAgc3RhdGljIGludCB4ZW5fc2F2ZV9waHlzbWFwKFhlbklPU3RhdGUg KnN0YXRlLCBYZW5QaHlzbWFwICpwaHlzbWFwKQogICAgIH0KICAgICByZXR1cm4gMDsKIH0KKyNl bHNlCitzdGF0aWMgaW50IHhlbl9zYXZlX3BoeXNtYXAoWGVuSU9TdGF0ZSAqc3RhdGUsIFhlblBo eXNtYXAgKnBoeXNtYXApCit7CisgICAgcmV0dXJuIDA7Cit9CisjZW5kaWYKIAogc3RhdGljIGlu dCB4ZW5fYWRkX3RvX3BoeXNtYXAoWGVuSU9TdGF0ZSAqc3RhdGUsCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBod2FkZHIgc3RhcnRfYWRkciwKQEAgLTM2OCw2ICszNzUsMjYgQEAgZ29f cGh5c21hcDoKICAgICBEUFJJTlRGKCJtYXBwaW5nIHZyYW0gdG8gJSJIV0FERFJfUFJJeCIgLSAl IkhXQUREUl9QUkl4IlxuIiwKICAgICAgICAgICAgIHN0YXJ0X2FkZHIsIHN0YXJ0X2FkZHIgKyBz aXplKTsKIAorICAgIG1yX25hbWUgPSBtZW1vcnlfcmVnaW9uX25hbWUobXIpOworCisgICAgcGh5 c21hcCA9IGdfbWFsbG9jKHNpemVvZiAoWGVuUGh5c21hcCkpOworCisgICAgcGh5c21hcC0+c3Rh cnRfYWRkciA9IHN0YXJ0X2FkZHI7CisgICAgcGh5c21hcC0+c2l6ZSA9IHNpemU7CisgICAgcGh5 c21hcC0+bmFtZSA9IG1yX25hbWU7CisgICAgcGh5c21hcC0+cGh5c19vZmZzZXQgPSBwaHlzX29m ZnNldDsKKworICAgIFFMSVNUX0lOU0VSVF9IRUFEKCZzdGF0ZS0+cGh5c21hcCwgcGh5c21hcCwg bGlzdCk7CisKKyAgICBpZiAocnVuc3RhdGVfY2hlY2soUlVOX1NUQVRFX0lOTUlHUkFURSkpIHsK KyAgICAgICAgLyogTm93IHdoZW4gd2UgaGF2ZSBhIHBoeXNtYXAgZW50cnkgd2UgY2FuIHJlcGxh Y2UgYSBkdW1teSBtYXBwaW5nIHdpdGgKKyAgICAgICAgICogYSByZWFsIG9uZSBvZiBndWVzdCBm b3JlaWduIG1lbW9yeS4gKi8KKyAgICAgICAgdWludDhfdCAqcCA9IHhlbl9yZXBsYWNlX2NhY2hl X2VudHJ5KHBoeXNfb2Zmc2V0LCBzdGFydF9hZGRyLCBzaXplKTsKKyAgICAgICAgYXNzZXJ0KHAg JiYgcCA9PSBtZW1vcnlfcmVnaW9uX2dldF9yYW1fcHRyKG1yKSk7CisKKyAgICAgICAgcmV0dXJu IDA7CisgICAgfQorCiAgICAgcGZuID0gcGh5c19vZmZzZXQgPj4gVEFSR0VUX1BBR0VfQklUUzsK ICAgICBzdGFydF9ncGZuID0gc3RhcnRfYWRkciA+PiBUQVJHRVRfUEFHRV9CSVRTOwogICAgIGZv ciAoaSA9IDA7IGkgPCBzaXplID4+IFRBUkdFVF9QQUdFX0JJVFM7IGkrKykgewpAQCAtMzgyLDE3 ICs0MDksNiBAQCBnb19waHlzbWFwOgogICAgICAgICB9CiAgICAgfQogCi0gICAgbXJfbmFtZSA9 IG1lbW9yeV9yZWdpb25fbmFtZShtcik7Ci0KLSAgICBwaHlzbWFwID0gZ19tYWxsb2Moc2l6ZW9m IChYZW5QaHlzbWFwKSk7Ci0KLSAgICBwaHlzbWFwLT5zdGFydF9hZGRyID0gc3RhcnRfYWRkcjsK LSAgICBwaHlzbWFwLT5zaXplID0gc2l6ZTsKLSAgICBwaHlzbWFwLT5uYW1lID0gbXJfbmFtZTsK LSAgICBwaHlzbWFwLT5waHlzX29mZnNldCA9IHBoeXNfb2Zmc2V0OwotCi0gICAgUUxJU1RfSU5T RVJUX0hFQUQoJnN0YXRlLT5waHlzbWFwLCBwaHlzbWFwLCBsaXN0KTsKLQogICAgIHhjX2RvbWFp bl9waW5fbWVtb3J5X2NhY2hlYXR0cih4ZW5feGMsIHhlbl9kb21pZCwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgc3RhcnRfYWRkciA+PiBUQVJHRVRfUEFHRV9CSVRTLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc3RhcnRfYWRkciArIHNpemUgLSAxKSA+ PiBUQVJHRVRfUEFHRV9CSVRTLApAQCAtMTE1OCw2ICsxMTc0LDcgQEAgc3RhdGljIHZvaWQgeGVu X2V4aXRfbm90aWZpZXIoTm90aWZpZXIgKm4sIHZvaWQgKmRhdGEpCiAgICAgeHNfZGFlbW9uX2Ns b3NlKHN0YXRlLT54ZW5zdG9yZSk7CiB9CiAKKyNpZmRlZiBYRU5fQ09NUEFUX1BIWVNNQVAKIHN0 YXRpYyB2b2lkIHhlbl9yZWFkX3BoeXNtYXAoWGVuSU9TdGF0ZSAqc3RhdGUpCiB7CiAgICAgWGVu UGh5c21hcCAqcGh5c21hcCA9IE5VTEw7CkBAIC0xMjA1LDYgKzEyMjIsMTEgQEAgc3RhdGljIHZv aWQgeGVuX3JlYWRfcGh5c21hcChYZW5JT1N0YXRlICpzdGF0ZSkKICAgICB9CiAgICAgZnJlZShl bnRyaWVzKTsKIH0KKyNlbHNlCitzdGF0aWMgdm9pZCB4ZW5fcmVhZF9waHlzbWFwKFhlbklPU3Rh dGUgKnN0YXRlKQoreworfQorI2VuZGlmCiAKIHN0YXRpYyB2b2lkIHhlbl93YWtldXBfbm90aWZp ZXIoTm90aWZpZXIgKm5vdGlmaWVyLCB2b2lkICpkYXRhKQogewpAQCAtMTMzMSw3ICsxMzUzLDEx IEBAIHZvaWQgeGVuX2h2bV9pbml0KFBDTWFjaGluZVN0YXRlICpwY21zLCBNZW1vcnlSZWdpb24g KipyYW1fbWVtb3J5KQogICAgIHN0YXRlLT5idWZpb3JlcV9sb2NhbF9wb3J0ID0gcmM7CiAKICAg ICAvKiBJbml0IFJBTSBtYW5hZ2VtZW50ICovCisjaWZkZWYgWEVOX0NPTVBBVF9QSFlTTUFQCiAg ICAgeGVuX21hcF9jYWNoZV9pbml0KHhlbl9waHlzX29mZnNldF90b19nYWRkciwgc3RhdGUpOwor I2Vsc2UKKyAgICB4ZW5fbWFwX2NhY2hlX2luaXQoTlVMTCwgc3RhdGUpOworI2VuZGlmCiAgICAg eGVuX3JhbV9pbml0KHBjbXMsIHJhbV9zaXplLCByYW1fbWVtb3J5KTsKIAogICAgIHFlbXVfYWRk X3ZtX2NoYW5nZV9zdGF0ZV9oYW5kbGVyKHhlbl9odm1fY2hhbmdlX3N0YXRlX2hhbmRsZXIsIHN0 YXRlKTsKZGlmZiAtLWdpdCBhL2luY2x1ZGUvaHcveGVuL3hlbl9jb21tb24uaCBiL2luY2x1ZGUv aHcveGVuL3hlbl9jb21tb24uaAppbmRleCA3MGE1Y2FkLi5jMDRjNWM5IDEwMDY0NAotLS0gYS9p bmNsdWRlL2h3L3hlbi94ZW5fY29tbW9uLmgKKysrIGIvaW5jbHVkZS9ody94ZW4veGVuX2NvbW1v bi5oCkBAIC04MCw2ICs4MCw3IEBAIGV4dGVybiB4ZW5mb3JlaWdubWVtb3J5X2hhbmRsZSAqeGVu X2ZtZW07CiAKICNpZiBDT05GSUdfWEVOX0NUUkxfSU5URVJGQUNFX1ZFUlNJT04gPCA0MTAwMAog CisjZGVmaW5lIFhFTl9DT01QQVRfUEhZU01BUAogI2RlZmluZSB4ZW5mb3JlaWdubWVtb3J5X21h cDIoaCwgZCwgYSwgcCwgZiwgcHMsIGFyLCBlKSBcCiAgICAgeGVuZm9yZWlnbm1lbW9yeV9tYXAo aCwgZCwgcCwgcHMsIGFyLCBlKQogCi0tIAoyLjcuNAoKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVs QGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=