From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51556) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZG6Mx-0006h7-BM for qemu-devel@nongnu.org; Fri, 17 Jul 2015 10:12:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZG6Ms-0005p8-Vj for qemu-devel@nongnu.org; Fri, 17 Jul 2015 10:12:07 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:36349) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZG6Ms-0005p0-Ii for qemu-devel@nongnu.org; Fri, 17 Jul 2015 10:12:02 -0400 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NRM00HIQY3Z6P90@mailout2.w1.samsung.com> for qemu-devel@nongnu.org; Fri, 17 Jul 2015 15:11:59 +0100 (BST) From: Pavel Fedin Date: Fri, 17 Jul 2015 17:11:58 +0300 Message-id: <035501d0c09a$8b91a920$a2b4fb60$@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit Content-language: ru Subject: [Qemu-devel] [PATCH] Merge memory_region_init_reservation() into memory_region_init_io() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: 'Paolo Bonzini' Just speficying ops = NULL in some cases can be more convenient than having two functions. See vGICv3 v5 patch set for at least one such case. GICv2 code can be refactored in a way similar to what is done in the mentioned patchset, killing some code duplication. Signed-off-by: Pavel Fedin --- include/exec/memory.h | 14 +++++++++++--- memory.c | 10 +--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 1394715..3b5e44e 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -436,6 +436,9 @@ void memory_region_init_alias(MemoryRegion *mr, * memory_region_init_rom_device: Initialize a ROM memory region. Writes are * handled via callbacks. * + * If NULL callbacks pointer is given, then I/O space is not supposed to be + * handled by QEMU itself. Any access via the memory API will cause an abort(). + * * @mr: the #MemoryRegion to be initialized. * @owner: the object that tracks the region's reference count * @ops: callbacks for write access handling. @@ -458,16 +461,21 @@ void memory_region_init_rom_device(MemoryRegion *mr, * A reservation region primariy serves debugging purposes. It claims I/O * space that is not supposed to be handled by QEMU itself. Any access via * the memory API will cause an abort(). + * This function is deprecated. Use memory_region_init_io() with NULL + * callbacks instead. * * @mr: the #MemoryRegion to be initialized * @owner: the object that tracks the region's reference count * @name: used for debugging; not visible to the user or ABI * @size: size of the region. */ -void memory_region_init_reservation(MemoryRegion *mr, - struct Object *owner, +static inline void memory_region_init_reservation(MemoryRegion *mr, + Object *owner, const char *name, - uint64_t size); + uint64_t size) +{ + memory_region_init_io(mr, owner, NULL, mr, name, size); +} /** * memory_region_init_iommu: Initialize a memory region that translates diff --git a/memory.c b/memory.c index 0acebb1..b843952 100644 --- a/memory.c +++ b/memory.c @@ -1187,7 +1187,7 @@ void memory_region_init_io(MemoryRegion *mr, uint64_t size) { memory_region_init(mr, owner, name, size); - mr->ops = ops; + mr->ops = ops ? ops : &unassigned_mem_ops; mr->opaque = opaque; mr->terminates = true; } @@ -1307,14 +1307,6 @@ void memory_region_init_iommu(MemoryRegion *mr, notifier_list_init(&mr->iommu_notify); } -void memory_region_init_reservation(MemoryRegion *mr, - Object *owner, - const char *name, - uint64_t size) -{ - memory_region_init_io(mr, owner, &unassigned_mem_ops, mr, name, size); -} - static void memory_region_finalize(Object *obj) { MemoryRegion *mr = MEMORY_REGION(obj); -- 1.9.5.msysgit.0