From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33159) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJgt4-0004OX-8Y for qemu-devel@nongnu.org; Tue, 19 Aug 2014 06:43:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XJgsz-0004Y9-3j for qemu-devel@nongnu.org; Tue, 19 Aug 2014 06:43:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52442) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJgsy-0004Y2-Sf for qemu-devel@nongnu.org; Tue, 19 Aug 2014 06:43:29 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7JAhSLG032523 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 19 Aug 2014 06:43:28 -0400 Received: from playground.com (ovpn-112-29.ams2.redhat.com [10.36.112.29]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s7JAh67I013080 for ; Tue, 19 Aug 2014 06:43:27 -0400 From: Paolo Bonzini Date: Tue, 19 Aug 2014 12:42:53 +0200 Message-Id: <1408444983-21464-11-git-send-email-pbonzini@redhat.com> In-Reply-To: <1408444983-21464-1-git-send-email-pbonzini@redhat.com> References: <1408444983-21464-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 10/20] nic: do not destroy memory regions in cleanup functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org The memory regions should be destroyed in the unrealize function; since these NICs are not even qdev-ified, they cannot be unplugged and they do not have to do anything to destroy their memory regions. Reviewed-by: Stefan Hajnoczi Reviewed-by: Peter Crosthwaite Signed-off-by: Paolo Bonzini --- hw/net/dp8393x.c | 3 --- hw/net/mcf_fec.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c index 789d385..7eab7ad 100644 --- a/hw/net/dp8393x.c +++ b/hw/net/dp8393x.c @@ -863,9 +863,6 @@ static void nic_cleanup(NetClientState *nc) { dp8393xState *s = qemu_get_nic_opaque(nc); - memory_region_del_subregion(s->address_space, &s->mmio); - memory_region_destroy(&s->mmio); - timer_del(s->watchdog); timer_free(s->watchdog); diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c index 4bff3de..22cd7cf 100644 --- a/hw/net/mcf_fec.c +++ b/hw/net/mcf_fec.c @@ -443,9 +443,6 @@ static void mcf_fec_cleanup(NetClientState *nc) { mcf_fec_state *s = qemu_get_nic_opaque(nc); - memory_region_del_subregion(s->sysmem, &s->iomem); - memory_region_destroy(&s->iomem); - g_free(s); } -- 1.8.3.1