From patchwork Tue Sep 3 12:32:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 272271 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B6F832C0084 for ; Wed, 4 Sep 2013 00:11:19 +1000 (EST) Received: from localhost ([::1]:45499 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpre-0002ez-LF for incoming@patchwork.ozlabs.org; Tue, 03 Sep 2013 08:37:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpnu-0006H4-K2 for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGpnl-0006LJ-4P for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:33:54 -0400 Received: from mail-ee0-x22a.google.com ([2a00:1450:4013:c00::22a]:45294) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpnk-0006LF-So for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:33:45 -0400 Received: by mail-ee0-f42.google.com with SMTP id b45so2968510eek.29 for ; Tue, 03 Sep 2013 05:33:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=0xARsdEKc2yfMM8DjVjFZwojY/D2lzj7jeVGf9aSLRs=; b=mgPn6g0pF8tT0YIRVUGsgL0c5Uft5ovax7LmK9MBAWqO1rmjLLDjRvLzvI/Aaxslof aYs9892Ty/pVV6vSNWUSZ6YI1n83LmPF+Gt4C/uCzqbCJhbEEUVLBhpIxATtzy9YbdDm 6MjU33UrqZ4dHqiwv7XJUHcp/dKZ9pah1vHpSCHvFUkdhrl2bpCxir//vA463/a9OzxX t5uR2ljHkxosY5bnBsI0g9sDLBA/mod9xKReqpPXjrb1xmPUdClcxu5SBc++0v0vOh62 ClrwtVvYpIzgIUhbsGdPBH8fWNp0hwRUYQwyERPP/z9NvfvJVdtdUIoBZZA2r3UYcUFB newQ== X-Received: by 10.14.103.69 with SMTP id e45mr4649920eeg.51.1378211624127; Tue, 03 Sep 2013 05:33:44 -0700 (PDT) Received: from playground.lan (net-37-117-144-28.cust.dsl.vodafone.it. [37.117.144.28]) by mx.google.com with ESMTPSA id f49sm31150419eec.7.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 03 Sep 2013 05:33:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 3 Sep 2013 14:32:55 +0200 Message-Id: <1378211609-16121-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1378211609-16121-1-git-send-email-pbonzini@redhat.com> References: <1378211609-16121-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c00::22a Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH 04/38] es1370: use instance_finalize instead of exit 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 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 adb66ce..b68fb84 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; @@ -1079,6 +1079,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)