From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36156) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxG8R-00063X-Qh for qemu-devel@nongnu.org; Wed, 18 Jun 2014 09:42:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxG8M-000080-Hg for qemu-devel@nongnu.org; Wed, 18 Jun 2014 09:42:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29172) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxG8K-00005q-SW for qemu-devel@nongnu.org; Wed, 18 Jun 2014 09:42:38 -0400 From: Paolo Bonzini Date: Wed, 18 Jun 2014 15:42:05 +0200 Message-Id: <1403098928-30749-9-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 08/11] memory: MemoryRegion: factor out subregion add functionality List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Crosthwaite From: Peter Crosthwaite Split off the core looping code that actually adds subregions into it's own fn. This prepares support for Memory Region qomification where setting the MR address or parent via QOM will back onto this more minimal function. Signed-off-by: Peter Crosthwaite [Rename new function. - Paolo] Signed-off-by: Paolo Bonzini --- memory.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/memory.c b/memory.c index 3811bd1..15f63e8 100644 --- a/memory.c +++ b/memory.c @@ -1423,18 +1423,15 @@ void memory_region_del_eventfd(MemoryRegion *mr, memory_region_transaction_commit(); } -static void memory_region_add_subregion_common(MemoryRegion *mr, - hwaddr offset, - MemoryRegion *subregion) +static void memory_region_update_parent_subregions(MemoryRegion *subregion) { + hwaddr offset = subregion->addr; + MemoryRegion *mr = subregion->parent; MemoryRegion *other; memory_region_transaction_begin(); - assert(!subregion->parent); memory_region_ref(subregion); - subregion->parent = mr; - subregion->addr = offset; QTAILQ_FOREACH(other, &mr->subregions, subregions_link) { if (subregion->may_overlap || other->may_overlap) { continue; @@ -1468,6 +1465,15 @@ done: memory_region_transaction_commit(); } +static void memory_region_add_subregion_common(MemoryRegion *mr, + hwaddr offset, + MemoryRegion *subregion) +{ + assert(!subregion->parent); + subregion->parent = mr; + subregion->addr = offset; + memory_region_update_parent_subregions(subregion); +} void memory_region_add_subregion(MemoryRegion *mr, hwaddr offset, -- 1.8.3.1