From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59545) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XN0SU-0007zl-Oj for qemu-devel@nongnu.org; Thu, 28 Aug 2014 10:13:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XN0SP-0002si-Rd for qemu-devel@nongnu.org; Thu, 28 Aug 2014 10:13:50 -0400 Received: from mail-wi0-x22a.google.com ([2a00:1450:400c:c05::22a]:54661) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XN0SP-0002sM-Hy for qemu-devel@nongnu.org; Thu, 28 Aug 2014 10:13:45 -0400 Received: by mail-wi0-f170.google.com with SMTP id cc10so611175wib.5 for ; Thu, 28 Aug 2014 07:13:44 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 28 Aug 2014 16:13:24 +0200 Message-Id: <1409235205-21376-8-git-send-email-pbonzini@redhat.com> In-Reply-To: <1409235205-21376-1-git-send-email-pbonzini@redhat.com> References: <1409235205-21376-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 7/8] xen: hvm: Abstract away memory region name ref List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite From: Peter Crosthwaite The mr->name field is removed. This slipped through compile testing. Fix. Reviewed-by: Stefan Weil Signed-off-by: Peter Crosthwaite Signed-off-by: Paolo Bonzini --- xen-hvm.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xen-hvm.c b/xen-hvm.c index d763e86..0d09940 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -291,6 +291,7 @@ static int xen_add_to_physmap(XenIOState *state, 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)) { return 0; @@ -326,11 +327,13 @@ go_physmap: } } + mr_name = memory_region_name(mr); + physmap = g_malloc(sizeof (XenPhysmap)); physmap->start_addr = start_addr; physmap->size = size; - physmap->name = mr->name; + physmap->name = mr_name; physmap->phys_offset = phys_offset; QLIST_INSERT_HEAD(&state->physmap, physmap, list); @@ -354,11 +357,11 @@ go_physmap: if (!xs_write(state->xenstore, 0, path, value, strlen(value))) { return -1; } - if (mr->name) { + 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))) { + if (!xs_write(state->xenstore, 0, path, mr_name, strlen(mr_name))) { return -1; } } -- 1.8.3.1