From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53215) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwLr-00073S-Rb for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UjwLq-0007EV-Ad for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:52:59 -0400 Received: from mail-wg0-x22a.google.com ([2a00:1450:400c:c00::22a]:58363) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwLq-0007EC-4R for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:52:58 -0400 Received: by mail-wg0-f42.google.com with SMTP id n12so4165746wgh.5 for ; Tue, 04 Jun 2013 11:52:57 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 4 Jun 2013 20:52:00 +0200 Message-Id: <1370371954-8479-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1370371954-8479-1-git-send-email-pbonzini@redhat.com> References: <1370371954-8479-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 05/39] es1370: use instance_finalize instead of exit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com Signed-off-by: Paolo Bonzini --- hw/audio/es1370.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c index c1cd169..a89ee10 100644 --- a/hw/audio/es1370.c +++ b/hw/audio/es1370.c @@ -1044,8 +1044,9 @@ static int es1370_initfn (PCIDevice *dev) return 0; } -static void es1370_exitfn (PCIDevice *dev) +static void es1370_instance_finalize (Object *obj) { + PCIDevice *dev = PCI_DEVICE(obj); ES1370State *s = DO_UPCAST (ES1370State, dev, dev); memory_region_destroy (&s->io); @@ -1063,7 +1064,6 @@ static void es1370_class_init (ObjectClass *klass, void *data) PCIDeviceClass *k = PCI_DEVICE_CLASS (klass); k->init = es1370_initfn; - k->exit = es1370_exitfn; k->vendor_id = PCI_VENDOR_ID_ENSONIQ; k->device_id = PCI_DEVICE_ID_ENSONIQ_ES1370; k->class_id = PCI_CLASS_MULTIMEDIA_AUDIO; @@ -1078,6 +1078,7 @@ static const TypeInfo es1370_info = { .parent = TYPE_PCI_DEVICE, .instance_size = sizeof (ES1370State), .class_init = es1370_class_init, + .instance_finalize = es1370_instance_finalize, }; static void es1370_register_types (void) -- 1.8.1.4