From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57226) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1e-0004r1-T8 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3t1S-0002ng-Ve for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:34 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53489 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3t1S-0002nW-QK for qemu-devel@nongnu.org; Mon, 29 Jul 2013 15:22:22 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 21:19:43 +0200 Message-Id: <1375125630-24869-127-git-send-email-afaerber@suse.de> In-Reply-To: <1375125630-24869-1-git-send-email-afaerber@suse.de> References: <1375125630-24869-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 126/173] stellaris_enet: Fix NetClientInfo::cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paul Brook Drop freeing stellaris_enet_state - that is done by QOM later on unref. Both MemoryRegion init and savevm registration happen in SysBusDevice initfn currently, so move them into an unrealizefn for now. Signed-off-by: Andreas F=C3=A4rber --- hw/net/stellaris_enet.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c index 6194e33..9dd77f7 100644 --- a/hw/net/stellaris_enet.c +++ b/hw/net/stellaris_enet.c @@ -391,11 +391,7 @@ static void stellaris_enet_cleanup(NetClientState *n= c) { stellaris_enet_state *s =3D qemu_get_nic_opaque(nc); =20 - unregister_savevm(DEVICE(s), "stellaris_enet", s); - - memory_region_destroy(&s->mmio); - - g_free(s); + s->nic =3D NULL; } =20 static NetClientInfo net_stellaris_enet_info =3D { @@ -427,6 +423,15 @@ static int stellaris_enet_init(SysBusDevice *sbd) return 0; } =20 +static void stellaris_enet_unrealize(DeviceState *dev, Error **errp) +{ + stellaris_enet_state *s =3D STELLARIS_ENET(dev); + + unregister_savevm(DEVICE(s), "stellaris_enet", s); + + memory_region_destroy(&s->mmio); +} + static Property stellaris_enet_properties[] =3D { DEFINE_NIC_PROPERTIES(stellaris_enet_state, conf), DEFINE_PROP_END_OF_LIST(), @@ -438,6 +443,7 @@ static void stellaris_enet_class_init(ObjectClass *kl= ass, void *data) SysBusDeviceClass *k =3D SYS_BUS_DEVICE_CLASS(klass); =20 k->init =3D stellaris_enet_init; + dc->unrealize =3D stellaris_enet_unrealize; dc->props =3D stellaris_enet_properties; } =20 --=20 1.8.1.4