[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/11] memory: MemoryRegion: factor out subregion add
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 08/11] memory: MemoryRegion: factor out subregion add functionality |
Date: |
Wed, 18 Jun 2014 15:42:05 +0200 |
From: Peter Crosthwaite <address@hidden>
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>
[Rename new function. - Paolo]
Signed-off-by: Paolo Bonzini <address@hidden>
---
memory.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/memory.c b/memory.c
index 3811bd1..15f63e8 100644
--- a/memory.c
+++ b/memory.c
@@ -1423,18 +1423,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 memory_region_update_parent_subregions(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;
@@ -1468,6 +1465,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;
+ memory_region_update_parent_subregions(subregion);
+}
void memory_region_add_subregion(MemoryRegion *mr,
hwaddr offset,
--
1.8.3.1
- [Qemu-devel] [PULL 00/11] Memory API changes for 2014-06-18, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 01/11] MAINTAINERS: Add myself as Memory API maintainer, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 02/11] exec: introduce qemu_ram_unset_idstr() to unset RAMBlock idstr, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 05/11] memory: Simplify mr_add_subregion() if-else, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 06/11] exec: dummy_section: Pass address space through., Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 09/11] memory: MemoryRegion: factor out memory region re-adder, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 08/11] memory: MemoryRegion: factor out subregion add functionality,
Paolo Bonzini <=
- [Qemu-devel] [PULL 07/11] qtest: fix qtest_clock_warp() for no deadline case, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 10/11] memory: MemoryRegion: rename parent to container, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 11/11] memory: Don't call memory_region_update_coalesced_range if nothing changed, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 03/11] unset RAMBlock idstr when unregister MemoryRegion, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 04/11] memory: Don't update all memory region when ioeventfd changed, Paolo Bonzini, 2014/06/18
- Re: [Qemu-devel] [PULL 00/11] Memory API changes for 2014-06-18, Peter Maydell, 2014/06/18