[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/15] memory: MemoryRegion: replace owner field with
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 10/15] memory: MemoryRegion: replace owner field with QOM parent |
Date: |
Tue, 1 Jul 2014 10:35:00 +0200 |
The two are now the same.
Reviewed-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
include/exec/memory.h | 1 -
memory.c | 35 +++++++++++++++++++++++++----------
2 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/include/exec/memory.h b/include/exec/memory.h
index 85b56e2..0c7e825 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -141,7 +141,6 @@ struct MemoryRegion {
const MemoryRegionOps *ops;
const MemoryRegionIOMMUOps *iommu_ops;
void *opaque;
- struct Object *owner;
MemoryRegion *container;
Int128 size;
hwaddr addr;
diff --git a/memory.c b/memory.c
index 9397fec..8970081 100644
--- a/memory.c
+++ b/memory.c
@@ -905,9 +905,11 @@ void memory_region_init(MemoryRegion *mr,
const char *name,
uint64_t size)
{
- object_initialize(mr, sizeof(*mr), TYPE_MEMORY_REGION);
+ if (!owner) {
+ owner = qdev_get_machine();
+ }
- mr->owner = owner ? owner : qdev_get_machine();
+ object_initialize(mr, sizeof(*mr), TYPE_MEMORY_REGION);
mr->size = int128_make64(size);
if (size == UINT64_MAX) {
mr->size = int128_2_64();
@@ -915,7 +917,7 @@ void memory_region_init(MemoryRegion *mr,
mr->name = g_strdup(name);
if (name) {
- object_property_add_child_array(mr->owner, name, OBJECT(mr));
+ object_property_add_child_array(owner, name, OBJECT(mr));
object_unref(OBJECT(mr));
}
}
@@ -1187,24 +1189,37 @@ void memory_region_destroy(MemoryRegion *mr)
Object *memory_region_owner(MemoryRegion *mr)
{
- return mr->owner;
+ Object *obj = OBJECT(mr);
+ return obj->parent;
}
void memory_region_ref(MemoryRegion *mr)
{
- if (mr && mr->owner) {
- object_ref(mr->owner);
+ /* MMIO callbacks most likely will access data that belongs
+ * to the owner, hence the need to ref/unref the owner whenever
+ * the memory region is in use.
+ *
+ * The memory region is a child of its owner. As long as the
+ * owner doesn't call unparent itself on the memory region,
+ * ref-ing the owner will also keep the memory region alive.
+ * Memory regions without an owner are supposed to never go away,
+ * but we still ref/unref them for debugging purposes.
+ */
+ Object *obj = OBJECT(mr);
+ if (obj && obj->parent) {
+ object_ref(obj->parent);
} else {
- object_ref(OBJECT(mr));
+ object_ref(obj);
}
}
void memory_region_unref(MemoryRegion *mr)
{
- if (mr && mr->owner) {
- object_unref(mr->owner);
+ Object *obj = OBJECT(mr);
+ if (obj && obj->parent) {
+ object_unref(obj->parent);
} else {
- object_unref(OBJECT(mr));
+ object_unref(obj);
}
}
--
1.8.3.1
- [Qemu-devel] [PULL for 2.1 00/15] MemoryRegion QOMification, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 01/15] qom: add object_property_add_alias(), Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 03/15] qom: allow creating an alias of a child<> property, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 05/15] qom: object: remove parent pointer when unparenting, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 02/15] qom: add a generic mechanism to resolve paths, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 06/15] qom: object: Ignore refs/unrefs of NULL, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 04/15] mc146818rtc: add "rtc-time" link to "/machine/rtc", Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 08/15] memory: MemoryRegion: use /machine as default owner, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 09/15] memory: MemoryRegion: QOMify, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 10/15] memory: MemoryRegion: replace owner field with QOM parent,
Paolo Bonzini <=
- [Qemu-devel] [PULL 07/15] libqtest: escape strings in QMP commands, fix leak, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 12/15] memory: MemoryRegion: Add may-overlap and priority props, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 11/15] memory: MemoryRegion: Add container and addr props, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 13/15] memory: MemoryRegion: Add size property, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 14/15] memory: do not give a name to the internal exec.c regions, Paolo Bonzini, 2014/07/01
- [Qemu-devel] [PULL 15/15] qdev: correctly send DEVICE_DELETED for recursively-deleted devices, Paolo Bonzini, 2014/07/01
- Re: [Qemu-devel] [PULL for 2.1 00/15] MemoryRegion QOMification, Peter Maydell, 2014/07/01