[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/20] memory: Use canonical path component as the na
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 19/20] memory: Use canonical path component as the name |
Date: |
Tue, 19 Aug 2014 12:43:02 +0200 |
From: Peter Crosthwaite <address@hidden>
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 <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
include/exec/memory.h | 1 -
memory.c | 4 +---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/include/exec/memory.h b/include/exec/memory.h
index d165b27..10f73d9 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -162,7 +162,6 @@ struct MemoryRegion {
QTAILQ_HEAD(subregions, MemoryRegion) subregions;
QTAILQ_ENTRY(MemoryRegion) subregions_link;
QTAILQ_HEAD(coalesced_ranges, CoalescedMemoryRange) coalesced;
- const char *name;
uint8_t dirty_log_mask;
unsigned ioeventfd_nb;
MemoryRegionIoeventfd *ioeventfds;
diff --git a/memory.c b/memory.c
index b6b208f..8da29af 100644
--- a/memory.c
+++ b/memory.c
@@ -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)
--
1.8.3.1
- [Qemu-devel] [PULL 09/20] vga: do not dynamically allocate chain4_alias, (continued)
- [Qemu-devel] [PULL 09/20] vga: do not dynamically allocate chain4_alias, Paolo Bonzini, 2014/08/19
- [Qemu-devel] [PULL 10/20] nic: do not destroy memory regions in cleanup functions, Paolo Bonzini, 2014/08/19
- [Qemu-devel] [PULL 11/20] ioport: split deletion and destruction, Paolo Bonzini, 2014/08/19
- [Qemu-devel] [PULL 12/20] memory: convert memory_region_destroy to object_unparent, Paolo Bonzini, 2014/08/19
- [Qemu-devel] [PULL 13/20] memory: remove memory_region_destroy, Paolo Bonzini, 2014/08/19
- [Qemu-devel] [PULL 14/20] tpm_tis: remove instance_finalize callback, Paolo Bonzini, 2014/08/19
- [Qemu-devel] [PULL 15/20] loader: Abstract away ref to memory region names, Paolo Bonzini, 2014/08/19
- [Qemu-devel] [PULL 16/20] exec: Abstract away ref to memory region names, Paolo Bonzini, 2014/08/19
- [Qemu-devel] [PULL 17/20] memory: constify memory_region_name, Paolo Bonzini, 2014/08/19
- [Qemu-devel] [PULL 18/20] memory: Use memory_region_name for name access, Paolo Bonzini, 2014/08/19
- [Qemu-devel] [PULL 19/20] memory: Use canonical path component as the name,
Paolo Bonzini <=
- [Qemu-devel] [PULL 20/20] mtree: remove write-only field, Paolo Bonzini, 2014/08/19
- Re: [Qemu-devel] [PULL 00/20] SCSI and memory changes for 2014-08-18, Peter Maydell, 2014/08/19