From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53957) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZkApv-0007UY-0n for qemu-devel@nongnu.org; Thu, 08 Oct 2015 09:02:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZkApq-00078k-R8 for qemu-devel@nongnu.org; Thu, 08 Oct 2015 09:02:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46565) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZkApq-00078U-Mx for qemu-devel@nongnu.org; Thu, 08 Oct 2015 09:02:14 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 3F8628E718 for ; Thu, 8 Oct 2015 13:02:14 +0000 (UTC) From: Markus Armbruster Date: Thu, 8 Oct 2015 15:02:02 +0200 Message-Id: <1444309331-17927-3-git-send-email-armbru@redhat.com> In-Reply-To: <1444309331-17927-1-git-send-email-armbru@redhat.com> References: <1444309331-17927-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL v2 02/11] memory: allow destroying a non-empty MemoryRegion List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini From: Paolo Bonzini This is legal; the MemoryRegion will simply unreference all the existing subregions and possibly bring them down with it as well. However, it requires a bit of care to avoid an infinite loop. Finalizing a memory region cannot trigger an address space update, but memory_region_del_subregion errs on the side of caution and might trigger a spurious update: avoid that by resetting mr->enabled first. Signed-off-by: Paolo Bonzini Signed-off-by: Markus Armbruster Message-Id: <1443689999-12182-2-git-send-email-armbru@redhat.com> --- memory.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/memory.c b/memory.c index ef87363..73d28ba 100644 --- a/memory.c +++ b/memory.c @@ -1304,7 +1304,22 @@ static void memory_region_finalize(Object *obj) { MemoryRegion *mr = MEMORY_REGION(obj); - assert(QTAILQ_EMPTY(&mr->subregions)); + assert(!mr->container); + + /* We know the region is not visible in any address space (it + * does not have a container and cannot be a root either because + * it has no references, so we can blindly clear mr->enabled. + * memory_region_set_enabled instead could trigger a transaction + * and cause an infinite loop. + */ + mr->enabled = false; + memory_region_transaction_begin(); + while (!QTAILQ_EMPTY(&mr->subregions)) { + MemoryRegion *subregion = QTAILQ_FIRST(&mr->subregions); + memory_region_del_subregion(mr, subregion); + } + memory_region_transaction_commit(); + mr->destructor(mr); memory_region_clear_coalescing(mr); g_free((char *)mr->name); -- 2.4.3