From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxG8M-0005uI-NK for qemu-devel@nongnu.org; Wed, 18 Jun 2014 09:42:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxG8H-00006e-KX for qemu-devel@nongnu.org; Wed, 18 Jun 2014 09:42:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59968) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxG8H-00006W-18 for qemu-devel@nongnu.org; Wed, 18 Jun 2014 09:42:33 -0400 From: Paolo Bonzini Date: Wed, 18 Jun 2014 15:42:06 +0200 Message-Id: <1403098928-30749-10-git-send-email-pbonzini@redhat.com> In-Reply-To: <1403098928-30749-1-git-send-email-pbonzini@redhat.com> References: <1403098928-30749-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 09/11] memory: MemoryRegion: factor out memory region re-adder List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite From: Peter Crosthwaite memory_region_set_address is mostly just a function that deletes and re-adds a memory region. Factor this generic functionality out into a re-usable function. This prepares support for further QOMification of MemoryRegion. Signed-off-by: Peter Crosthwaite Signed-off-by: Paolo Bonzini --- memory.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/memory.c b/memory.c index 15f63e8..06a4af7 100644 --- a/memory.c +++ b/memory.c @@ -1517,21 +1517,27 @@ void memory_region_set_enabled(MemoryRegion *mr, bool enabled) memory_region_transaction_commit(); } -void memory_region_set_address(MemoryRegion *mr, hwaddr addr) +static void memory_region_readd_subregion(MemoryRegion *mr) { MemoryRegion *parent = mr->parent; - if (addr == mr->addr || !parent) { - mr->addr = addr; - return; + if (parent) { + memory_region_transaction_begin(); + memory_region_ref(mr); + memory_region_del_subregion(parent, mr); + mr->parent = parent; + memory_region_update_parent_subregions(mr); + memory_region_unref(mr); + memory_region_transaction_commit(); } +} - memory_region_transaction_begin(); - memory_region_ref(mr); - memory_region_del_subregion(parent, mr); - memory_region_add_subregion_common(parent, addr, mr); - memory_region_unref(mr); - memory_region_transaction_commit(); +void memory_region_set_address(MemoryRegion *mr, hwaddr addr) +{ + if (addr != mr->addr) { + mr->addr = addr; + memory_region_readd_subregion(mr); + } } void memory_region_set_alias_offset(MemoryRegion *mr, hwaddr offset) -- 1.8.3.1