[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH memory v1 5/5] memory: Use canonical path component
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PATCH memory v1 5/5] memory: Use canonical path component as the name |
Date: |
Thu, 14 Aug 2014 23:56:08 -0700 |
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>
---
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 081f85b..9b3e6f7 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 e3ee338..d4de571 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);
}
@@ -1316,7 +1314,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)
--
2.0.1.1.gfbfc394
- [Qemu-devel] [PATCH memory v1 0/5] MemoryRegion Name QOMification, Peter Crosthwaite, 2014/08/15
- [Qemu-devel] [PATCH memory v1 1/5] loader: Abstract away ref to memory region names, Peter Crosthwaite, 2014/08/15
- [Qemu-devel] [PATCH memory v1 2/5] exec: Abstract away ref to memory region names, Peter Crosthwaite, 2014/08/15
- [Qemu-devel] [PATCH memory v1 3/5] memory: constify memory_region_name, Peter Crosthwaite, 2014/08/15
- [Qemu-devel] [PATCH memory v1 4/5] memory: Use memory_region_name for name access, Peter Crosthwaite, 2014/08/15
- [Qemu-devel] [PATCH memory v1 5/5] memory: Use canonical path component as the name,
Peter Crosthwaite <=
- Re: [Qemu-devel] [PATCH memory v1 0/5] MemoryRegion Name QOMification, Paolo Bonzini, 2014/08/17