From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WuhVg-0008SK-6A for qemu-devel@nongnu.org; Wed, 11 Jun 2014 08:20:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WuhVa-0001Yo-62 for qemu-devel@nongnu.org; Wed, 11 Jun 2014 08:20:08 -0400 Received: from mail-wi0-x236.google.com ([2a00:1450:400c:c05::236]:33591) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WuhVZ-0001Wn-UE for qemu-devel@nongnu.org; Wed, 11 Jun 2014 08:20:02 -0400 Received: by mail-wi0-f182.google.com with SMTP id bs8so963983wib.9 for ; Wed, 11 Jun 2014 05:19:58 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 11 Jun 2014 14:19:35 +0200 Message-Id: <1402489176-19738-13-git-send-email-pbonzini@redhat.com> In-Reply-To: <1402489176-19738-1-git-send-email-pbonzini@redhat.com> References: <1402489176-19738-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [RFC PATCH 12/13] memory: MemoryRegion: Add may-overlap and priority props List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.crosthwaite@xilinx.com, afaerber@suse.de From: Peter Crosthwaite QOM propertyify the .may-overlap and .priority fields. Signed-off-by: Peter Crosthwaite [Remove setters. - Paolo] Signed-off-by: Paolo Bonzini --- 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 bcea4df..c526e13 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -156,7 +156,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 13a9fe8..7d3266a 100644 --- a/memory.c +++ b/memory.c @@ -915,6 +915,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); @@ -937,6 +953,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