From patchwork Tue Sep 3 12:32:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 272266 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 4E1EF2C00A3 for ; Wed, 4 Sep 2013 00:01:54 +1000 (EST) Received: from localhost ([::1]:45486 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpqA-0000Lp-F2 for incoming@patchwork.ozlabs.org; Tue, 03 Sep 2013 08:36:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52707) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpns-0006H3-5D for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGpnj-0006LA-HR for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:33:52 -0400 Received: from mail-ea0-x230.google.com ([2a00:1450:4013:c01::230]:54144) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpnj-0006KF-AY for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:33:43 -0400 Received: by mail-ea0-f176.google.com with SMTP id q16so2952104ead.21 for ; Tue, 03 Sep 2013 05:33:42 -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=IKtFeJ0whx6FMhnlf001fLeUA7ehSBXaHPMbdtFWTok=; b=T/8wFCPLzOaPqHxxNsBlvkoAyvs7eqwCmRMs9BP2FPoG0+mBwBtKfSf5q1gM24Qhns DgrMB6sVCeUsUCZP8DlwCXjxzI8A12ksDm5HB11d41yi1RpJxdLGFmqf8b55rVOByTOg 69lOzKz3kIudNFgZq9VCFaHutw1NiptmVYeWVFnc/MwN6APnylXbgk8u+Vn0++m6OCpp WIUPIBgVQzXx8TKBdTawhZT1MeetgmbAafK4QpklWiqwV3RyjSPQvrk2W9uwVGYd6sdw 32OX+5n7cTZR+GaJ0gUm5zi97yqz5A0Kvw+Pb94yEuk+EKo/4udNAWaYz8a2x42TLmlU HVzA== X-Received: by 10.15.45.8 with SMTP id a8mr46283824eew.1.1378211622414; Tue, 03 Sep 2013 05:33:42 -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:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 3 Sep 2013 14:32:54 +0200 Message-Id: <1378211609-16121-4-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:c01::230 Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH 03/38] ac97: 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/ac97.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c index 01b4dfb..04ae601 100644 --- a/hw/audio/ac97.c +++ b/hw/audio/ac97.c @@ -1390,8 +1390,9 @@ static int ac97_initfn (PCIDevice *dev) return 0; } -static void ac97_exitfn (PCIDevice *dev) +static void ac97_instance_finalize (Object *obj) { + PCIDevice *dev = PCI_DEVICE(obj); AC97LinkState *s = DO_UPCAST (AC97LinkState, dev, dev); memory_region_destroy (&s->io_nam); @@ -1415,7 +1416,6 @@ static void ac97_class_init (ObjectClass *klass, void *data) PCIDeviceClass *k = PCI_DEVICE_CLASS (klass); k->init = ac97_initfn; - k->exit = ac97_exitfn; k->vendor_id = PCI_VENDOR_ID_INTEL; k->device_id = PCI_DEVICE_ID_INTEL_82801AA_5; k->revision = 0x01; @@ -1431,6 +1431,7 @@ static const TypeInfo ac97_info = { .parent = TYPE_PCI_DEVICE, .instance_size = sizeof (AC97LinkState), .class_init = ac97_class_init, + .instance_finalize = ac97_instance_finalize, }; static void ac97_register_types (void)