From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36552) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBzKy-0007VK-E2 for qemu-devel@nongnu.org; Sun, 25 Mar 2012 22:07:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SBzKw-0000MF-44 for qemu-devel@nongnu.org; Sun, 25 Mar 2012 22:07:11 -0400 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:45341) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBzKv-0000HT-Ge for qemu-devel@nongnu.org; Sun, 25 Mar 2012 22:07:10 -0400 Received: from /spool/local by e28smtp04.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 26 Mar 2012 07:36:59 +0530 Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q2Q26sd14051060 for ; Mon, 26 Mar 2012 07:36:56 +0530 Received: from d28av05.in.ibm.com (loopback [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q2Q7bNgk030725 for ; Mon, 26 Mar 2012 18:37:23 +1100 From: Wanpeng Li Date: Mon, 26 Mar 2012 10:06:44 +0800 Message-Id: <1332727608-26523-3-git-send-email-liwp@linux.vnet.ibm.com> In-Reply-To: <1332727608-26523-1-git-send-email-liwp@linux.vnet.ibm.com> References: <1332727608-26523-1-git-send-email-liwp@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 2/6] convert MemoryRegion to QOM List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Wanpeng Li , Anthony Liguori , Avi Kivity , Gavin Shan From: Anthony Liguori Signed-off-by: Anthony Liguori Signed-off-by: Wanpeng Li --- memory.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++---------------- memory.h | 8 +++++ 2 files changed, 78 insertions(+), 24 deletions(-) diff --git a/memory.c b/memory.c index 22b0352..ec1a4ae 100644 --- a/memory.c +++ b/memory.c @@ -797,35 +797,26 @@ static bool memory_region_wrong_endianness(MemoryRegion *mr) #endif } -void memory_region_init(MemoryRegion *mr, - const char *name, - uint64_t size) +void memory_region_set_name(MemoryRegion *mr, const char *name) +{ + mr->name = g_strdup(name); +} + +void memory_region_set_size(MemoryRegion *mr, uint64_t size) { - mr->ops = NULL; - mr->parent = NULL; mr->size = int128_make64(size); if (size == UINT64_MAX) { mr->size = int128_2_64(); } - mr->addr = 0; - mr->subpage = false; - mr->enabled = true; - mr->terminates = false; - mr->ram = false; - mr->readable = true; - mr->readonly = false; - mr->rom_device = false; - mr->destructor = memory_region_destructor_none; - mr->priority = 0; - mr->may_overlap = false; - mr->alias = NULL; - QTAILQ_INIT(&mr->subregions); - memset(&mr->subregions_link, 0, sizeof mr->subregions_link); - QTAILQ_INIT(&mr->coalesced); - mr->name = g_strdup(name); - mr->dirty_log_mask = 0; - mr->ioeventfd_nb = 0; - mr->ioeventfds = NULL; +} + +void memory_region_init(MemoryRegion *mr, + const char *name, + uint64_t size) +{ + object_initialize(mr, TYPE_MEMORY_REGION); + memory_region_set_name(mr, name); + memory_region_set_size(mr, size); } static bool memory_region_access_valid(MemoryRegion *mr, @@ -1640,3 +1631,58 @@ void mtree_info(fprintf_function mon_printf, void *f) mtree_print_mr(mon_printf, f, address_space_io.root, 0, 0, &ml_head); } } + +static void memory_region_initfn(Object *obj) +{ + MemoryRegion *mr = MEMORY_REGION(obj); + mr->ops = NULL; + mr->parent = NULL; + mr->size = int128_2_64(); + mr->addr = 0; + mr->subpage = false; + mr->enabled = true; + mr->terminates = false; + mr->ram = false; + mr->readable = true; + mr->readonly = false; + mr->rom_device = false; + mr->destructor = memory_region_destructor_none; + mr->priority = 0; + mr->may_overlap = false; + mr->alias = NULL; + mr->name = NULL; + QTAILQ_INIT(&mr->subregions); + memset(&mr->subregions_link, 0, sizeof mr->subregions_link); + QTAILQ_INIT(&mr->coalesced); + mr->dirty_log_mask = 0; + mr->ioeventfd_nb = 0; + mr->ioeventfds = NULL; +} + +static void memory_region_finalize(Object *obj) +{ + MemoryRegion *mr = MEMORY_REGION(obj); + + assert(QTAILQ_EMPTY(&mr->subregions)); + mr->destructor(mr); + memory_region_clear_coalescing(mr); + if (mr->name) { + g_free((char *)mr->name); + } + g_free(mr->ioeventfds); +} + +static TypeInfo memory_region_type = { + .name = TYPE_MEMORY_REGION, + .parent = TYPE_OBJECT, + .instance_size = sizeof(MemoryRegion), + .instance_init = memory_region_initfn, + .instance_finalize = memory_region_finalize, +}; + +static void register_devices(void) +{ + type_register_static(&memory_region_type); +} + +type_init(register_devices); diff --git a/memory.h b/memory.h index 53ff62b..d4d5600 100644 --- a/memory.h +++ b/memory.h @@ -25,6 +25,7 @@ #include "iorange.h" #include "ioport.h" #include "int128.h" +#include "qemu/object.h" typedef struct MemoryRegionOps MemoryRegionOps; typedef struct MemoryRegion MemoryRegion; @@ -116,6 +117,9 @@ struct MemoryRegionOps { typedef struct CoalescedMemoryRange CoalescedMemoryRange; typedef struct MemoryRegionIoeventfd MemoryRegionIoeventfd; +#define TYPE_MEMORY_REGION "memory-region" +#define MEMORY_REGION(obj) OBJECT_CHECK(MemoryRegion, (obj), TYPE_MEMORY_REGION) + struct MemoryRegion { /* All fields are private - violators will be prosecuted */ const MemoryRegionOps *ops; @@ -719,6 +723,10 @@ void memory_global_dirty_log_stop(void); void mtree_info(fprintf_function mon_printf, void *f); +void memory_region_set_name(MemoryRegion *mr, const char *name); + +void memory_region_set_size(MemoryRegion *mr, uint64_t size); + #endif #endif -- 1.7.5.4