From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53709) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSsbH-0005js-Ae for qemu-devel@nongnu.org; Wed, 05 Jul 2017 18:16:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dSsbE-0007Gu-52 for qemu-devel@nongnu.org; Wed, 05 Jul 2017 18:16:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:54352) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dSsbD-0007G2-S9 for qemu-devel@nongnu.org; Wed, 05 Jul 2017 18:16:44 -0400 Date: Wed, 5 Jul 2017 15:16:40 -0700 (PDT) From: Stefano Stabellini In-Reply-To: <1499183267-28623-2-git-send-email-igor.druzhinin@citrix.com> Message-ID: References: <1499183267-28623-1-git-send-email-igor.druzhinin@citrix.com> <1499183267-28623-2-git-send-email-igor.druzhinin@citrix.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Subject: Re: [Qemu-devel] [PATCH v2 1/4] xen: move physmap saving into a separate function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Druzhinin Cc: xen-devel@lists.xenproject.org, qemu-devel@nongnu.org, sstabellini@kernel.org, anthony.perard@citrix.com, paul.durrant@citrix.com, pbonzini@redhat.com On Tue, 4 Jul 2017, Igor Druzhinin wrote: > Non-functional change. > > Signed-off-by: Igor Druzhinin Unless you change something from a previous version, please retain the acked-by and reviewed-by that were given (see alpine.DEB.2.10.1706301629170.2919@sstabellini-ThinkPad-X260). > --- > hw/i386/xen/xen-hvm.c | 57 ++++++++++++++++++++++++++++----------------------- > 1 file changed, 31 insertions(+), 26 deletions(-) > > diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c > index cffa7e2..d259cf7 100644 > --- a/hw/i386/xen/xen-hvm.c > +++ b/hw/i386/xen/xen-hvm.c > @@ -305,6 +305,36 @@ static hwaddr xen_phys_offset_to_gaddr(hwaddr start_addr, > return start_addr; > } > > +static int xen_save_physmap(XenIOState *state, XenPhysmap *physmap) > +{ > + char path[80], value[17]; > + > + snprintf(path, sizeof(path), > + "/local/domain/0/device-model/%d/physmap/%"PRIx64"/start_addr", > + xen_domid, (uint64_t)physmap->phys_offset); > + snprintf(value, sizeof(value), "%"PRIx64, (uint64_t)physmap->start_addr); > + if (!xs_write(state->xenstore, 0, path, value, strlen(value))) { > + return -1; > + } > + snprintf(path, sizeof(path), > + "/local/domain/0/device-model/%d/physmap/%"PRIx64"/size", > + xen_domid, (uint64_t)physmap->phys_offset); > + snprintf(value, sizeof(value), "%"PRIx64, (uint64_t)physmap->size); > + if (!xs_write(state->xenstore, 0, path, value, strlen(value))) { > + return -1; > + } > + if (physmap->name) { > + snprintf(path, sizeof(path), > + "/local/domain/0/device-model/%d/physmap/%"PRIx64"/name", > + xen_domid, (uint64_t)physmap->phys_offset); > + if (!xs_write(state->xenstore, 0, path, > + physmap->name, strlen(physmap->name))) { > + return -1; > + } > + } > + return 0; > +} > + > static int xen_add_to_physmap(XenIOState *state, > hwaddr start_addr, > ram_addr_t size, > @@ -316,7 +346,6 @@ static int xen_add_to_physmap(XenIOState *state, > XenPhysmap *physmap = NULL; > hwaddr pfn, start_gpfn; > hwaddr phys_offset = memory_region_get_ram_addr(mr); > - char path[80], value[17]; > const char *mr_name; > > if (get_physmapping(state, start_addr, size)) { > @@ -368,31 +397,7 @@ go_physmap: > start_addr >> TARGET_PAGE_BITS, > (start_addr + size - 1) >> TARGET_PAGE_BITS, > XEN_DOMCTL_MEM_CACHEATTR_WB); > - > - snprintf(path, sizeof(path), > - "/local/domain/0/device-model/%d/physmap/%"PRIx64"/start_addr", > - xen_domid, (uint64_t)phys_offset); > - snprintf(value, sizeof(value), "%"PRIx64, (uint64_t)start_addr); > - if (!xs_write(state->xenstore, 0, path, value, strlen(value))) { > - return -1; > - } > - snprintf(path, sizeof(path), > - "/local/domain/0/device-model/%d/physmap/%"PRIx64"/size", > - xen_domid, (uint64_t)phys_offset); > - snprintf(value, sizeof(value), "%"PRIx64, (uint64_t)size); > - if (!xs_write(state->xenstore, 0, path, value, strlen(value))) { > - return -1; > - } > - if (mr_name) { > - snprintf(path, sizeof(path), > - "/local/domain/0/device-model/%d/physmap/%"PRIx64"/name", > - xen_domid, (uint64_t)phys_offset); > - if (!xs_write(state->xenstore, 0, path, mr_name, strlen(mr_name))) { > - return -1; > - } > - } > - > - return 0; > + return xen_save_physmap(state, physmap); > } > > static int xen_remove_from_physmap(XenIOState *state, > -- > 2.7.4 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: Re: [PATCH v2 1/4] xen: move physmap saving into a separate function Date: Wed, 5 Jul 2017 15:16:40 -0700 (PDT) Message-ID: References: <1499183267-28623-1-git-send-email-igor.druzhinin@citrix.com> <1499183267-28623-2-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 1dSsbF-0007Dz-Cp for xen-devel@lists.xenproject.org; Wed, 05 Jul 2017 22:16:45 +0000 In-Reply-To: <1499183267-28623-2-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: Igor Druzhinin Cc: sstabellini@kernel.org, qemu-devel@nongnu.org, paul.durrant@citrix.com, pbonzini@redhat.com, anthony.perard@citrix.com, xen-devel@lists.xenproject.org List-Id: xen-devel@lists.xenproject.org T24gVHVlLCA0IEp1bCAyMDE3LCBJZ29yIERydXpoaW5pbiB3cm90ZToKPiBOb24tZnVuY3Rpb25h bCBjaGFuZ2UuCj4gCj4gU2lnbmVkLW9mZi1ieTogSWdvciBEcnV6aGluaW4gPGlnb3IuZHJ1emhp bmluQGNpdHJpeC5jb20+CgpVbmxlc3MgeW91IGNoYW5nZSBzb21ldGhpbmcgZnJvbSBhIHByZXZp b3VzIHZlcnNpb24sIHBsZWFzZSByZXRhaW4gdGhlCmFja2VkLWJ5IGFuZCByZXZpZXdlZC1ieSB0 aGF0IHdlcmUgZ2l2ZW4gKHNlZQphbHBpbmUuREVCLjIuMTAuMTcwNjMwMTYyOTE3MC4yOTE5QHNz dGFiZWxsaW5pLVRoaW5rUGFkLVgyNjApLgoKCj4gLS0tCj4gIGh3L2kzODYveGVuL3hlbi1odm0u YyB8IDU3ICsrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQo+ICAxIGZpbGUgY2hhbmdlZCwgMzEgaW5zZXJ0aW9ucygrKSwgMjYgZGVsZXRpb25zKC0pCj4g Cj4gZGlmZiAtLWdpdCBhL2h3L2kzODYveGVuL3hlbi1odm0uYyBiL2h3L2kzODYveGVuL3hlbi1o dm0uYwo+IGluZGV4IGNmZmE3ZTIuLmQyNTljZjcgMTAwNjQ0Cj4gLS0tIGEvaHcvaTM4Ni94ZW4v eGVuLWh2bS5jCj4gKysrIGIvaHcvaTM4Ni94ZW4veGVuLWh2bS5jCj4gQEAgLTMwNSw2ICszMDUs MzYgQEAgc3RhdGljIGh3YWRkciB4ZW5fcGh5c19vZmZzZXRfdG9fZ2FkZHIoaHdhZGRyIHN0YXJ0 X2FkZHIsCj4gICAgICByZXR1cm4gc3RhcnRfYWRkcjsKPiAgfQo+ICAKPiArc3RhdGljIGludCB4 ZW5fc2F2ZV9waHlzbWFwKFhlbklPU3RhdGUgKnN0YXRlLCBYZW5QaHlzbWFwICpwaHlzbWFwKQo+ ICt7Cj4gKyAgICBjaGFyIHBhdGhbODBdLCB2YWx1ZVsxN107Cj4gKwo+ICsgICAgc25wcmludGYo cGF0aCwgc2l6ZW9mKHBhdGgpLAo+ICsgICAgICAgICAgICAiL2xvY2FsL2RvbWFpbi8wL2Rldmlj ZS1tb2RlbC8lZC9waHlzbWFwLyUiUFJJeDY0Ii9zdGFydF9hZGRyIiwKPiArICAgICAgICAgICAg eGVuX2RvbWlkLCAodWludDY0X3QpcGh5c21hcC0+cGh5c19vZmZzZXQpOwo+ICsgICAgc25wcmlu dGYodmFsdWUsIHNpemVvZih2YWx1ZSksICIlIlBSSXg2NCwgKHVpbnQ2NF90KXBoeXNtYXAtPnN0 YXJ0X2FkZHIpOwo+ICsgICAgaWYgKCF4c193cml0ZShzdGF0ZS0+eGVuc3RvcmUsIDAsIHBhdGgs IHZhbHVlLCBzdHJsZW4odmFsdWUpKSkgewo+ICsgICAgICAgIHJldHVybiAtMTsKPiArICAgIH0K PiArICAgIHNucHJpbnRmKHBhdGgsIHNpemVvZihwYXRoKSwKPiArICAgICAgICAgICAgIi9sb2Nh bC9kb21haW4vMC9kZXZpY2UtbW9kZWwvJWQvcGh5c21hcC8lIlBSSXg2NCIvc2l6ZSIsCj4gKyAg ICAgICAgICAgIHhlbl9kb21pZCwgKHVpbnQ2NF90KXBoeXNtYXAtPnBoeXNfb2Zmc2V0KTsKPiAr ICAgIHNucHJpbnRmKHZhbHVlLCBzaXplb2YodmFsdWUpLCAiJSJQUkl4NjQsICh1aW50NjRfdClw aHlzbWFwLT5zaXplKTsKPiArICAgIGlmICgheHNfd3JpdGUoc3RhdGUtPnhlbnN0b3JlLCAwLCBw YXRoLCB2YWx1ZSwgc3RybGVuKHZhbHVlKSkpIHsKPiArICAgICAgICByZXR1cm4gLTE7Cj4gKyAg ICB9Cj4gKyAgICBpZiAocGh5c21hcC0+bmFtZSkgewo+ICsgICAgICAgIHNucHJpbnRmKHBhdGgs IHNpemVvZihwYXRoKSwKPiArICAgICAgICAgICAgICAgICIvbG9jYWwvZG9tYWluLzAvZGV2aWNl LW1vZGVsLyVkL3BoeXNtYXAvJSJQUkl4NjQiL25hbWUiLAo+ICsgICAgICAgICAgICAgICAgeGVu X2RvbWlkLCAodWludDY0X3QpcGh5c21hcC0+cGh5c19vZmZzZXQpOwo+ICsgICAgICAgIGlmICgh eHNfd3JpdGUoc3RhdGUtPnhlbnN0b3JlLCAwLCBwYXRoLAo+ICsgICAgICAgICAgICAgICAgICAg ICAgcGh5c21hcC0+bmFtZSwgc3RybGVuKHBoeXNtYXAtPm5hbWUpKSkgewo+ICsgICAgICAgICAg ICByZXR1cm4gLTE7Cj4gKyAgICAgICAgfQo+ICsgICAgfQo+ICsgICAgcmV0dXJuIDA7Cj4gK30K PiArCj4gIHN0YXRpYyBpbnQgeGVuX2FkZF90b19waHlzbWFwKFhlbklPU3RhdGUgKnN0YXRlLAo+ ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBod2FkZHIgc3RhcnRfYWRkciwKPiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcmFtX2FkZHJfdCBzaXplLAo+IEBAIC0zMTYsNyAr MzQ2LDYgQEAgc3RhdGljIGludCB4ZW5fYWRkX3RvX3BoeXNtYXAoWGVuSU9TdGF0ZSAqc3RhdGUs Cj4gICAgICBYZW5QaHlzbWFwICpwaHlzbWFwID0gTlVMTDsKPiAgICAgIGh3YWRkciBwZm4sIHN0 YXJ0X2dwZm47Cj4gICAgICBod2FkZHIgcGh5c19vZmZzZXQgPSBtZW1vcnlfcmVnaW9uX2dldF9y YW1fYWRkcihtcik7Cj4gLSAgICBjaGFyIHBhdGhbODBdLCB2YWx1ZVsxN107Cj4gICAgICBjb25z dCBjaGFyICptcl9uYW1lOwo+ICAKPiAgICAgIGlmIChnZXRfcGh5c21hcHBpbmcoc3RhdGUsIHN0 YXJ0X2FkZHIsIHNpemUpKSB7Cj4gQEAgLTM2OCwzMSArMzk3LDcgQEAgZ29fcGh5c21hcDoKPiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGFydF9hZGRyID4+IFRBUkdFVF9Q QUdFX0JJVFMsCj4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0YXJ0X2Fk ZHIgKyBzaXplIC0gMSkgPj4gVEFSR0VUX1BBR0VfQklUUywKPiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBYRU5fRE9NQ1RMX01FTV9DQUNIRUFUVFJfV0IpOwo+IC0KPiAtICAg IHNucHJpbnRmKHBhdGgsIHNpemVvZihwYXRoKSwKPiAtICAgICAgICAgICAgIi9sb2NhbC9kb21h aW4vMC9kZXZpY2UtbW9kZWwvJWQvcGh5c21hcC8lIlBSSXg2NCIvc3RhcnRfYWRkciIsCj4gLSAg ICAgICAgICAgIHhlbl9kb21pZCwgKHVpbnQ2NF90KXBoeXNfb2Zmc2V0KTsKPiAtICAgIHNucHJp bnRmKHZhbHVlLCBzaXplb2YodmFsdWUpLCAiJSJQUkl4NjQsICh1aW50NjRfdClzdGFydF9hZGRy KTsKPiAtICAgIGlmICgheHNfd3JpdGUoc3RhdGUtPnhlbnN0b3JlLCAwLCBwYXRoLCB2YWx1ZSwg c3RybGVuKHZhbHVlKSkpIHsKPiAtICAgICAgICByZXR1cm4gLTE7Cj4gLSAgICB9Cj4gLSAgICBz bnByaW50ZihwYXRoLCBzaXplb2YocGF0aCksCj4gLSAgICAgICAgICAgICIvbG9jYWwvZG9tYWlu LzAvZGV2aWNlLW1vZGVsLyVkL3BoeXNtYXAvJSJQUkl4NjQiL3NpemUiLAo+IC0gICAgICAgICAg ICB4ZW5fZG9taWQsICh1aW50NjRfdClwaHlzX29mZnNldCk7Cj4gLSAgICBzbnByaW50Zih2YWx1 ZSwgc2l6ZW9mKHZhbHVlKSwgIiUiUFJJeDY0LCAodWludDY0X3Qpc2l6ZSk7Cj4gLSAgICBpZiAo IXhzX3dyaXRlKHN0YXRlLT54ZW5zdG9yZSwgMCwgcGF0aCwgdmFsdWUsIHN0cmxlbih2YWx1ZSkp KSB7Cj4gLSAgICAgICAgcmV0dXJuIC0xOwo+IC0gICAgfQo+IC0gICAgaWYgKG1yX25hbWUpIHsK PiAtICAgICAgICBzbnByaW50ZihwYXRoLCBzaXplb2YocGF0aCksCj4gLSAgICAgICAgICAgICAg ICAiL2xvY2FsL2RvbWFpbi8wL2RldmljZS1tb2RlbC8lZC9waHlzbWFwLyUiUFJJeDY0Ii9uYW1l IiwKPiAtICAgICAgICAgICAgICAgIHhlbl9kb21pZCwgKHVpbnQ2NF90KXBoeXNfb2Zmc2V0KTsK PiAtICAgICAgICBpZiAoIXhzX3dyaXRlKHN0YXRlLT54ZW5zdG9yZSwgMCwgcGF0aCwgbXJfbmFt ZSwgc3RybGVuKG1yX25hbWUpKSkgewo+IC0gICAgICAgICAgICByZXR1cm4gLTE7Cj4gLSAgICAg ICAgfQo+IC0gICAgfQo+IC0KPiAtICAgIHJldHVybiAwOwo+ICsgICAgcmV0dXJuIHhlbl9zYXZl X3BoeXNtYXAoc3RhdGUsIHBoeXNtYXApOwo+ICB9Cj4gIAo+ICBzdGF0aWMgaW50IHhlbl9yZW1v dmVfZnJvbV9waHlzbWFwKFhlbklPU3RhdGUgKnN0YXRlLAo+IC0tIAo+IDIuNy40Cj4gCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFp bGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94 ZW4tZGV2ZWwK