[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v1 07/25] memory: MemoryRegion: factor out memory regi
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [RFC v1 07/25] memory: MemoryRegion: factor out memory region re-adder |
Date: |
Thu, 15 May 2014 18:53:58 -0700 |
memory_region_set_address is mostly just a function that deletes and
re-adds a memory region. Factor this generic functionality out into a
re-usable function. This prepares support for further QOMification
of MemoryRegion.
Signed-off-by: Peter Crosthwaite <address@hidden>
---
memory.c | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/memory.c b/memory.c
index 4a70920..9b9cfad 100644
--- a/memory.c
+++ b/memory.c
@@ -829,6 +829,20 @@ static void
memory_region_destructor_rom_device(MemoryRegion *mr)
qemu_ram_free(mr->ram_addr & TARGET_PAGE_MASK);
}
+static void do_memory_region_add_subregion_common(MemoryRegion *subregion);
+
+static void memory_region_readd_subregion(MemoryRegion *mr)
+{
+ if (mr->contained) {
+ memory_region_transaction_begin();
+ memory_region_ref(mr);
+ memory_region_del_subregion(mr->parent, mr);
+ do_memory_region_add_subregion_common(mr);
+ memory_region_unref(mr);
+ memory_region_transaction_commit();
+ }
+}
+
void memory_region_init(MemoryRegion *mr,
Object *owner,
const char *name,
@@ -845,7 +859,6 @@ void memory_region_init(MemoryRegion *mr,
mr->name = g_strdup(name);
}
-static void do_memory_region_add_subregion_common(MemoryRegion *subregion);
static void memory_region_get_addr(Object *obj, Visitor *v, void *opaque,
const char *name, Error **errp)
@@ -1563,19 +1576,10 @@ void memory_region_set_enabled(MemoryRegion *mr, bool
enabled)
void memory_region_set_address(MemoryRegion *mr, hwaddr addr)
{
- MemoryRegion *parent = mr->parent;
-
- if (addr == mr->addr || !mr->contained) {
+ if (addr != mr->addr) {
mr->addr = addr;
- return;
+ memory_region_readd_subregion(mr);
}
-
- memory_region_transaction_begin();
- memory_region_ref(mr);
- memory_region_del_subregion(parent, mr);
- do_memory_region_add_subregion_common(mr);
- memory_region_unref(mr);
- memory_region_transaction_commit();
}
void memory_region_set_alias_offset(MemoryRegion *mr, hwaddr offset)
--
1.9.3.1.ga73a6ad
- [Qemu-devel] [RFC v1 00/25] Memory and GPIO QOMification, Peter Crosthwaite, 2014/05/15
- [Qemu-devel] [RFC v1 01/25] qdev: Implement named GPIOs, Peter Crosthwaite, 2014/05/15
- [Qemu-devel] [RFC v1 02/25] memory: Simplify mr_add_subregion() if-else, Peter Crosthwaite, 2014/05/15
- [Qemu-devel] [RFC v1 03/25] memory: Coreify subregion add functionality, Peter Crosthwaite, 2014/05/15
- [Qemu-devel] [RFC v1 04/25] memory: MemoryRegion: QOMify, Peter Crosthwaite, 2014/05/15
- [Qemu-devel] [RFC v1 05/25] memory: MemoryRegion: Add contained flag, Peter Crosthwaite, 2014/05/15
- [Qemu-devel] [RFC v1 06/25] memory: MemoryRegion: Add container and addr props, Peter Crosthwaite, 2014/05/15
- [Qemu-devel] [RFC v1 07/25] memory: MemoryRegion: factor out memory region re-adder,
Peter Crosthwaite <=
- [Qemu-devel] [RFC v1 08/25] memory: MemoryRegion: Add may-overlap and priority props, Peter Crosthwaite, 2014/05/15
- [Qemu-devel] [RFC v1 09/25] memory: MemoryRegion: Add size property, Peter Crosthwaite, 2014/05/15
- [Qemu-devel] [RFC v1 10/25] exec: Parent root MRs to the machine, Peter Crosthwaite, 2014/05/15
- [Qemu-devel] [RFC v1 11/25] irq: Slim conversion of qemu_irq to QOM [WIP], Peter Crosthwaite, 2014/05/15
- [Qemu-devel] [RFC v1 12/25] qdev: gpio: Don't allow name share between I and O, Peter Crosthwaite, 2014/05/15
- [Qemu-devel] [RFC v1 13/25] qdev: gpio: Register GPIO inputs as child objects, Peter Crosthwaite, 2014/05/15