[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/15] memory: MemoryRegion: Add may-overlap and prio
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 12/15] memory: MemoryRegion: Add may-overlap and priority props |
Date: |
Tue, 1 Jul 2014 10:35:02 +0200 |
From: Peter Crosthwaite <address@hidden>
QOM propertyify the .may-overlap and .priority fields. The setters
will re-add the memory as a subregion if needed (i.e. the values change
when the memory region is already contained).
Signed-off-by: Peter Crosthwaite <address@hidden>
[Remove setters. - Paolo]
Signed-off-by: Paolo Bonzini <address@hidden>
---
include/exec/memory.h | 2 +-
memory.c | 24 ++++++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/include/exec/memory.h b/include/exec/memory.h
index 0c7e825..e2c8e3e 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -157,7 +157,7 @@ struct MemoryRegion {
bool flush_coalesced_mmio;
MemoryRegion *alias;
hwaddr alias_offset;
- int priority;
+ int32_t priority;
bool may_overlap;
QTAILQ_HEAD(subregions, MemoryRegion) subregions;
QTAILQ_ENTRY(MemoryRegion) subregions_link;
diff --git a/memory.c b/memory.c
index 04dc933..834959b 100644
--- a/memory.c
+++ b/memory.c
@@ -955,6 +955,22 @@ static Object *memory_region_resolve_container(Object
*obj, void *opaque,
return OBJECT(mr->container);
}
+static void memory_region_get_priority(Object *obj, Visitor *v, void *opaque,
+ const char *name, Error **errp)
+{
+ MemoryRegion *mr = MEMORY_REGION(obj);
+ int32_t value = mr->priority;
+
+ visit_type_int32(v, &value, name, errp);
+}
+
+static bool memory_region_get_may_overlap(Object *obj, Error **errp)
+{
+ MemoryRegion *mr = MEMORY_REGION(obj);
+
+ return mr->may_overlap;
+}
+
static void memory_region_initfn(Object *obj)
{
MemoryRegion *mr = MEMORY_REGION(obj);
@@ -978,6 +994,14 @@ static void memory_region_initfn(Object *obj)
memory_region_get_addr,
NULL, /* memory_region_set_addr */
NULL, NULL, &error_abort);
+ object_property_add(OBJECT(mr), "priority", "uint32",
+ memory_region_get_priority,
+ NULL, /* memory_region_set_priority */
+ NULL, NULL, &error_abort);
+ object_property_add_bool(OBJECT(mr), "may-overlap",
+ memory_region_get_may_overlap,
+ NULL, /* memory_region_set_may_overlap */
+ &error_abort);
}
static uint64_t unassigned_mem_read(void *opaque, hwaddr addr,
--
1.8.3.1
- [Qemu-devel] [PULL 01/15] qom: add object_property_add_alias(), (continued)
- [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, 2014/07/01
- [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 <=
- [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