david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

memory: MemoryRegion: Add may-overlap and priority props

Browse Source 
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 <peter.crosthwaite@xilinx.com>
[Remove setters. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Peter Crosthwaite 2014-06-05 23:17:01 -07:00 committed by Paolo Bonzini
parent 409ddd0139
commit d33382da9a
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/exec/memory.h
View File

@ -157,7 +157,7 @@ struct MemoryRegion {
bool flush_coalesced_mmio; bool flush_coalesced_mmio;
MemoryRegion *alias; MemoryRegion *alias;
hwaddr alias_offset; hwaddr alias_offset;
int priority; int32_t priority;
bool may_overlap; bool may_overlap;
QTAILQ_HEAD(subregions, MemoryRegion) subregions; QTAILQ_HEAD(subregions, MemoryRegion) subregions;
QTAILQ_ENTRY(MemoryRegion) subregions_link; QTAILQ_ENTRY(MemoryRegion) subregions_link;

24
memory.c
View File

@ -955,6 +955,22 @@ static Object *memory_region_resolve_container(Object *obj, void *opaque,
return OBJECT(mr->container); 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) static void memory_region_initfn(Object *obj)
{ {
MemoryRegion *mr = MEMORY_REGION(obj); MemoryRegion *mr = MEMORY_REGION(obj);
@ -978,6 +994,14 @@ static void memory_region_initfn(Object *obj)
memory_region_get_addr, memory_region_get_addr,
NULL, /* memory_region_set_addr */ NULL, /* memory_region_set_addr */
NULL, NULL, &error_abort); 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, static uint64_t unassigned_mem_read(void *opaque, hwaddr addr,