From patchwork Wed Jul 30 10:27:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 374772 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id EB04C1401A5 for ; Wed, 30 Jul 2014 20:30:28 +1000 (EST) Received: from localhost ([::1]:50116 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCR9O-0005k7-Sg for incoming@patchwork.ozlabs.org; Wed, 30 Jul 2014 06:30:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35581) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCR6f-0000w0-OP for qemu-devel@nongnu.org; Wed, 30 Jul 2014 06:27:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XCR6Z-00013Q-Jq for qemu-devel@nongnu.org; Wed, 30 Jul 2014 06:27:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55361) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCR6Z-00013C-DI for qemu-devel@nongnu.org; Wed, 30 Jul 2014 06:27:31 -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 (8.14.4/8.14.4) with ESMTP id s6UARUQF017516 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Jul 2014 06:27:30 -0400 Received: from playground.com (ovpn-112-33.ams2.redhat.com [10.36.112.33]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s6UARFLf017135; Wed, 30 Jul 2014 06:27:28 -0400 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 30 Jul 2014 12:27:09 +0200 Message-Id: <1406716032-21795-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1406716032-21795-1-git-send-email-pbonzini@redhat.com> References: <1406716032-21795-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: peter.crosthwaite@xilinx.com Subject: [Qemu-devel] [PATCH 6/9] ioport: split deletion and destruction X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Of the two functions portio_list_del and portio_list_destroy, the latter is just freeing a memory area. However, portio_list_del is the logical equivalent of memory_region_del_subregion so destruction of memory regions does not belong there. Signed-off-by: Paolo Bonzini --- ioport.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ioport.c b/ioport.c index 3d91e79..dce94a3 100644 --- a/ioport.c +++ b/ioport.c @@ -149,6 +149,14 @@ void portio_list_set_flush_coalesced(PortioList *piolist) void portio_list_destroy(PortioList *piolist) { + MemoryRegionPortioList *mrpio; + unsigned i; + + for (i = 0; i < piolist->nr; ++i) { + mrpio = container_of(piolist->regions[i], MemoryRegionPortioList, mr); + memory_region_destroy(&mrpio->mr); + g_free(mrpio); + } g_free(piolist->regions); } @@ -291,8 +299,5 @@ void portio_list_del(PortioList *piolist) for (i = 0; i < piolist->nr; ++i) { mrpio = container_of(piolist->regions[i], MemoryRegionPortioList, mr); memory_region_del_subregion(piolist->address_space, &mrpio->mr); - memory_region_destroy(&mrpio->mr); - g_free(mrpio); - piolist->regions[i] = NULL; } }