From mboxrd@z Thu Jan 1 00:00:00 1970 From: Igor Druzhinin Subject: [PATCH 4/4] xen: don't use xenstore to save/restore physmap anymore Date: Fri, 30 Jun 2017 17:07:05 +0100 Message-ID: <1498838825-23701-5-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.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQySZ-0003l1-G0 for xen-devel@lists.xenproject.org; Fri, 30 Jun 2017 16:07:55 +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 SWYgd2UgaGF2ZSBhIHN5c3RlbSB3aXRoIHhlbmZvcmVpZ25tZW1vcnlfbWFwMigpIGltcGxlbWVu dGVkCndlIGRvbid0IG5lZWQgdG8gc2F2ZS9yZXN0b3JlIHBoeXNtYXAgb24gc3VzcGVuZC9yZXN0 b3JlCmFueW1vcmUuIEluIGNhc2Ugd2UgcmVzdW1lIGEgVk0gd2l0aG91dCBwaHlzbWFwIC0gdHJ5 IHRvCnJlY3JlYXRlIHRoZSBwaHlzbWFwIGR1cmluZyBtZW1vcnkgcmVnaW9uIHJlc3RvcmUgcGhh c2UgYW5kCnJlbWFwIG1hcCBjYWNoZSBlbnRyaWVzIGFjY29yZGluZ2x5LiBUaGUgb2xkIGNvZGUg aXMgbGVmdApmb3IgY29tcGF0aWJpbGl0eSByZWFzb25zLgoKU2lnbmVkLW9mZi1ieTogSWdvciBE cnV6aGluaW4gPGlnb3IuZHJ1emhpbmluQGNpdHJpeC5jb20+Ci0tLQogaHcvaTM4Ni94ZW4veGVu LWh2bS5jICAgICAgIHwgNDUgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0t LS0tLS0tCiBpbmNsdWRlL2h3L3hlbi94ZW5fY29tbW9uLmggfCAgMSArCiAyIGZpbGVzIGNoYW5n ZWQsIDM1IGluc2VydGlvbnMoKyksIDExIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2h3L2kz ODYveGVuL3hlbi1odm0uYyBiL2h3L2kzODYveGVuL3hlbi1odm0uYwppbmRleCBkMjU5Y2Y3Li4x YjZhNWNlIDEwMDY0NAotLS0gYS9ody9pMzg2L3hlbi94ZW4taHZtLmMKKysrIGIvaHcvaTM4Ni94 ZW4veGVuLWh2bS5jCkBAIC0zMDUsNiArMzA1LDcgQEAgc3RhdGljIGh3YWRkciB4ZW5fcGh5c19v ZmZzZXRfdG9fZ2FkZHIoaHdhZGRyIHN0YXJ0X2FkZHIsCiAgICAgcmV0dXJuIHN0YXJ0X2FkZHI7 CiB9CiAKKyNpZmRlZiBYRU5fQ09NUEFUX1BIWVNNQVAKIHN0YXRpYyBpbnQgeGVuX3NhdmVfcGh5 c21hcChYZW5JT1N0YXRlICpzdGF0ZSwgWGVuUGh5c21hcCAqcGh5c21hcCkKIHsKICAgICBjaGFy IHBhdGhbODBdLCB2YWx1ZVsxN107CkBAIC0zMzQsNiArMzM1LDEyIEBAIHN0YXRpYyBpbnQgeGVu X3NhdmVfcGh5c21hcChYZW5JT1N0YXRlICpzdGF0ZSwgWGVuUGh5c21hcCAqcGh5c21hcCkKICAg ICB9CiAgICAgcmV0dXJuIDA7CiB9CisjZWxzZQorc3RhdGljIGludCB4ZW5fc2F2ZV9waHlzbWFw KFhlbklPU3RhdGUgKnN0YXRlLCBYZW5QaHlzbWFwICpwaHlzbWFwKQoreworICAgIHJldHVybiAw OworfQorI2VuZGlmCiAKIHN0YXRpYyBpbnQgeGVuX2FkZF90b19waHlzbWFwKFhlbklPU3RhdGUg KnN0YXRlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaHdhZGRyIHN0YXJ0X2FkZHIs CkBAIC0zNjgsNiArMzc1LDI2IEBAIGdvX3BoeXNtYXA6CiAgICAgRFBSSU5URigibWFwcGluZyB2 cmFtIHRvICUiSFdBRERSX1BSSXgiIC0gJSJIV0FERFJfUFJJeCJcbiIsCiAgICAgICAgICAgICBz dGFydF9hZGRyLCBzdGFydF9hZGRyICsgc2l6ZSk7CiAKKyAgICBtcl9uYW1lID0gbWVtb3J5X3Jl Z2lvbl9uYW1lKG1yKTsKKworICAgIHBoeXNtYXAgPSBnX21hbGxvYyhzaXplb2YgKFhlblBoeXNt YXApKTsKKworICAgIHBoeXNtYXAtPnN0YXJ0X2FkZHIgPSBzdGFydF9hZGRyOworICAgIHBoeXNt YXAtPnNpemUgPSBzaXplOworICAgIHBoeXNtYXAtPm5hbWUgPSBtcl9uYW1lOworICAgIHBoeXNt YXAtPnBoeXNfb2Zmc2V0ID0gcGh5c19vZmZzZXQ7CisKKyAgICBRTElTVF9JTlNFUlRfSEVBRCgm c3RhdGUtPnBoeXNtYXAsIHBoeXNtYXAsIGxpc3QpOworCisgICAgaWYgKHJ1bnN0YXRlX2NoZWNr KFJVTl9TVEFURV9JTk1JR1JBVEUpKSB7CisgICAgICAgIC8qIE5vdyB3aGVuIHdlIGhhdmUgYSBw aHlzbWFwIGVudHJ5IHdlIGNhbiByZW1hcCBhIGR1bW15IG1hcHBpbmcgYW5kIGNoYW5nZQorICAg ICAgICAgKiBpdCB0byBhIHJlYWwgb25lIG9mIGd1ZXN0IGZvcmVpZ24gbWVtb3J5LiAqLworICAg ICAgICB1aW50OF90ICpwID0geGVuX3JlbWFwX2NhY2hlX2VudHJ5KHBoeXNfb2Zmc2V0LCBzaXpl KTsKKyAgICAgICAgYXNzZXJ0KHAgJiYgcCA9PSBtZW1vcnlfcmVnaW9uX2dldF9yYW1fcHRyKG1y KSk7CisKKyAgICAgICAgcmV0dXJuIDA7CisgICAgfQorCiAgICAgcGZuID0gcGh5c19vZmZzZXQg Pj4gVEFSR0VUX1BBR0VfQklUUzsKICAgICBzdGFydF9ncGZuID0gc3RhcnRfYWRkciA+PiBUQVJH RVRfUEFHRV9CSVRTOwogICAgIGZvciAoaSA9IDA7IGkgPCBzaXplID4+IFRBUkdFVF9QQUdFX0JJ VFM7IGkrKykgewpAQCAtMzgyLDIxICs0MDksMTEgQEAgZ29fcGh5c21hcDoKICAgICAgICAgfQog ICAgIH0KIAotICAgIG1yX25hbWUgPSBtZW1vcnlfcmVnaW9uX25hbWUobXIpOwotCi0gICAgcGh5 c21hcCA9IGdfbWFsbG9jKHNpemVvZiAoWGVuUGh5c21hcCkpOwotCi0gICAgcGh5c21hcC0+c3Rh cnRfYWRkciA9IHN0YXJ0X2FkZHI7Ci0gICAgcGh5c21hcC0+c2l6ZSA9IHNpemU7Ci0gICAgcGh5 c21hcC0+bmFtZSA9IG1yX25hbWU7Ci0gICAgcGh5c21hcC0+cGh5c19vZmZzZXQgPSBwaHlzX29m ZnNldDsKLQotICAgIFFMSVNUX0lOU0VSVF9IRUFEKCZzdGF0ZS0+cGh5c21hcCwgcGh5c21hcCwg bGlzdCk7Ci0KICAgICB4Y19kb21haW5fcGluX21lbW9yeV9jYWNoZWF0dHIoeGVuX3hjLCB4ZW5f ZG9taWQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXJ0X2FkZHIgPj4g VEFSR0VUX1BBR0VfQklUUywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0 YXJ0X2FkZHIgKyBzaXplIC0gMSkgPj4gVEFSR0VUX1BBR0VfQklUUywKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgWEVOX0RPTUNUTF9NRU1fQ0FDSEVBVFRSX1dCKTsKKwogICAg IHJldHVybiB4ZW5fc2F2ZV9waHlzbWFwKHN0YXRlLCBwaHlzbWFwKTsKIH0KIApAQCAtMTE1OCw2 ICsxMTc1LDcgQEAgc3RhdGljIHZvaWQgeGVuX2V4aXRfbm90aWZpZXIoTm90aWZpZXIgKm4sIHZv aWQgKmRhdGEpCiAgICAgeHNfZGFlbW9uX2Nsb3NlKHN0YXRlLT54ZW5zdG9yZSk7CiB9CiAKKyNp ZmRlZiBYRU5fQ09NUEFUX1BIWVNNQVAKIHN0YXRpYyB2b2lkIHhlbl9yZWFkX3BoeXNtYXAoWGVu SU9TdGF0ZSAqc3RhdGUpCiB7CiAgICAgWGVuUGh5c21hcCAqcGh5c21hcCA9IE5VTEw7CkBAIC0x MjA1LDYgKzEyMjMsMTEgQEAgc3RhdGljIHZvaWQgeGVuX3JlYWRfcGh5c21hcChYZW5JT1N0YXRl ICpzdGF0ZSkKICAgICB9CiAgICAgZnJlZShlbnRyaWVzKTsKIH0KKyNlbHNlCitzdGF0aWMgdm9p ZCB4ZW5fcmVhZF9waHlzbWFwKFhlbklPU3RhdGUgKnN0YXRlKQoreworfQorI2VuZGlmCiAKIHN0 YXRpYyB2b2lkIHhlbl93YWtldXBfbm90aWZpZXIoTm90aWZpZXIgKm5vdGlmaWVyLCB2b2lkICpk YXRhKQogewpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9ody94ZW4veGVuX2NvbW1vbi5oIGIvaW5jbHVk ZS9ody94ZW4veGVuX2NvbW1vbi5oCmluZGV4IDcwYTVjYWQuLmMwNGM1YzkgMTAwNjQ0Ci0tLSBh L2luY2x1ZGUvaHcveGVuL3hlbl9jb21tb24uaAorKysgYi9pbmNsdWRlL2h3L3hlbi94ZW5fY29t bW9uLmgKQEAgLTgwLDYgKzgwLDcgQEAgZXh0ZXJuIHhlbmZvcmVpZ25tZW1vcnlfaGFuZGxlICp4 ZW5fZm1lbTsKIAogI2lmIENPTkZJR19YRU5fQ1RSTF9JTlRFUkZBQ0VfVkVSU0lPTiA8IDQxMDAw CiAKKyNkZWZpbmUgWEVOX0NPTVBBVF9QSFlTTUFQCiAjZGVmaW5lIHhlbmZvcmVpZ25tZW1vcnlf bWFwMihoLCBkLCBhLCBwLCBmLCBwcywgYXIsIGUpIFwKICAgICB4ZW5mb3JlaWdubWVtb3J5X21h cChoLCBkLCBwLCBwcywgYXIsIGUpCiAKLS0gCjIuNy40CgoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2 ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==