[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 7/8] xen: hvm: Abstract away memory region name ref
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 7/8] xen: hvm: Abstract away memory region name ref |
Date: |
Thu, 28 Aug 2014 16:13:24 +0200 |
From: Peter Crosthwaite <address@hidden>
The mr->name field is removed. This slipped through compile testing.
Fix.
Reviewed-by: Stefan Weil <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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
- [Qemu-devel] [PULL 0/8] SCSI and memory changes for 2014-08-28, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 3/8] block/iscsi: fix memory corruption on iscsi resize, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 1/8] block: Pass errp in blkconf_geometry, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 4/8] scsi-generic: remove superfluous DPRINTF avoid to break compiling, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 6/8] xen-hvm: Constify string, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 2/8] scsi-bus: Convert DeviceClass init to realize, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 7/8] xen: hvm: Abstract away memory region name ref,
Paolo Bonzini <=
- [Qemu-devel] [PULL 5/8] virtio-scsi: Report error if num_queues is 0 or too large, Paolo Bonzini, 2014/08/28
- [Qemu-devel] [PULL 8/8] memory: Lazy init name from QOM name as needed, Paolo Bonzini, 2014/08/28
- Re: [Qemu-devel] [PULL 0/8] SCSI and memory changes for 2014-08-28, Peter Maydell, 2014/08/28