[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH memory v2 4/9] memory: Coreify subregion add functio
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PATCH memory v2 4/9] memory: Coreify subregion add functionality |
Date: |
Tue, 27 May 2014 02:01:47 -0700 |
Split off the core looping code that actually adds subregions into
it's own fn. This prepares support for Memory Region qomification
where setting the MR address or parent via QOM will back onto this more
minimal function.
Signed-off-by: Peter Crosthwaite <address@hidden>
---
memory.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/memory.c b/memory.c
index 1352881..dd0a576 100644
--- a/memory.c
+++ b/memory.c
@@ -1410,18 +1410,15 @@ void memory_region_del_eventfd(MemoryRegion *mr,
memory_region_transaction_commit();
}
-static void memory_region_add_subregion_common(MemoryRegion *mr,
- hwaddr offset,
- MemoryRegion *subregion)
+static void do_memory_region_add_subregion_common(MemoryRegion *subregion)
{
+ hwaddr offset = subregion->addr;
+ MemoryRegion *mr = subregion->parent;
MemoryRegion *other;
memory_region_transaction_begin();
- assert(!subregion->parent);
memory_region_ref(subregion);
- subregion->parent = mr;
- subregion->addr = offset;
QTAILQ_FOREACH(other, &mr->subregions, subregions_link) {
if (subregion->may_overlap || other->may_overlap) {
continue;
@@ -1455,6 +1452,15 @@ done:
memory_region_transaction_commit();
}
+static void memory_region_add_subregion_common(MemoryRegion *mr,
+ hwaddr offset,
+ MemoryRegion *subregion)
+{
+ assert(!subregion->parent);
+ subregion->parent = mr;
+ subregion->addr = offset;
+ do_memory_region_add_subregion_common(subregion);
+}
void memory_region_add_subregion(MemoryRegion *mr,
hwaddr offset,
--
1.9.3.1.ga73a6ad
- [Qemu-devel] [PATCH memory v2 0/9] Memory Region QOMification, Peter Crosthwaite, 2014/05/27
- [Qemu-devel] [PATCH memory v2 1/9] memory: Simplify mr_add_subregion() if-else, Peter Crosthwaite, 2014/05/27
- [Qemu-devel] [PATCH memory v2 2/9] qom: object: Ignore refs/unrefs of NULL, Peter Crosthwaite, 2014/05/27
- [Qemu-devel] [PATCH memory v2 3/9] qom: Publish object_resolve_link, Peter Crosthwaite, 2014/05/27
- [Qemu-devel] [PATCH memory v2 4/9] memory: Coreify subregion add functionality,
Peter Crosthwaite <=
- [Qemu-devel] [PATCH memory v2 5/9] memory: MemoryRegion: factor out memory region re-adder, Peter Crosthwaite, 2014/05/27
- [Qemu-devel] [PATCH memory v2 6/9] memory: MemoryRegion: QOMify, Peter Crosthwaite, 2014/05/27
- [Qemu-devel] [PATCH memory v2 7/9] memory: MemoryRegion: Add container and addr props, Peter Crosthwaite, 2014/05/27
- [Qemu-devel] [PATCH memory v2 8/9] memory: MemoryRegion: Add may-overlap and priority props, Peter Crosthwaite, 2014/05/27
- [Qemu-devel] [PATCH memory v2 9/9] memory: MemoryRegion: Add size property, Peter Crosthwaite, 2014/05/27