diff options
author | Peter Crosthwaite <peter.crosthwaite@xilinx.com> | 2014-08-14 23:56:08 -0700 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-08-18 12:06:21 +0200 |
commit | b0225c2c0d89200a29dc3d0b59d2e87a79cbaeb8 (patch) | |
tree | d0b7382a2cd9f791ecbb18be260c0fab5995c0a0 /memory.c | |
parent | 3fb18b4da7a545321e38b4a59f38995630a8d752 (diff) |
memory: Use canonical path component as the name
Rather than having the name as separate state. This prepares support
for creating a MemoryRegion dynamically (i.e. without
memory_region_init() and friends) and the MemoryRegion still getting
a usable name.
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'memory.c')
-rw-r--r-- | memory.c | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -915,7 +915,6 @@ void memory_region_init(MemoryRegion *mr, if (size == UINT64_MAX) { mr->size = int128_2_64(); } - mr->name = g_strdup(name); if (name) { object_property_add_child_array(owner, name, OBJECT(mr)); @@ -1260,7 +1259,6 @@ static void memory_region_finalize(Object *obj) assert(memory_region_transaction_depth == 0); mr->destructor(mr); memory_region_clear_coalescing(mr); - g_free((char *)mr->name); g_free(mr->ioeventfds); } @@ -1310,7 +1308,7 @@ uint64_t memory_region_size(MemoryRegion *mr) const char *memory_region_name(const MemoryRegion *mr) { - return mr->name; + return object_get_canonical_path_component(OBJECT(mr)); } bool memory_region_is_ram(MemoryRegion *mr) |