From patchwork Tue Jun 4 18:52:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 248844 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 918742C0090 for ; Wed, 5 Jun 2013 05:13:31 +1000 (EST) Received: from localhost ([::1]:41482 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ujwfh-0004il-KW for incoming@patchwork.ozlabs.org; Tue, 04 Jun 2013 15:13:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53817) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwMq-0000R7-2y for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:54:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UjwMp-0007tT-5R for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:54:00 -0400 Received: from mail-wi0-x230.google.com ([2a00:1450:400c:c05::230]:54868) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwMo-0007tO-VW for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:59 -0400 Received: by mail-wi0-f176.google.com with SMTP id hr14so4067189wib.3 for ; Tue, 04 Jun 2013 11:53:58 -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:x-mailer:in-reply-to :references; bh=E0bHI/NXrxfe3oaKS+Ek5dEvrlcvmUpNviH73Jd82lU=; b=eKDffzCvbssm824SwzpubuwryM12mSBmW3RCfwkpCRvHuhmD2SS2Tb2TLu5rXtJEtV Au0MO/pZhfnpQGSqEl+EJOoJg38tk5BT3ECbpPq3RRklwBIjlvtC09Q+O16VTTbnwto1 XfvvOeD0uu5vADp5OLMNS9ZOFTkD7lquurjVNf0gvsl03BxDct8vFRWFD8uDrWuj402h 6wEcPEKQwhlSq8o/FEfwTb9NBy7TSLwKK5gbwzR3TziPS+WvdaA/x8R7ISHYx+3o4Pbj MBsm86kkKMQZAFHl49m4lJAOEV+WpzMRqrHuAe8V8EH6i36DIPGzlwR24rPJ9Jlu5S70 BjIw== X-Received: by 10.180.208.49 with SMTP id mb17mr2879262wic.46.1370372038195; Tue, 04 Jun 2013 11:53:58 -0700 (PDT) Received: from playground.lan (net-37-116-217-184.cust.dsl.vodafone.it. [37.116.217.184]) by mx.google.com with ESMTPSA id fx7sm4590484wic.11.2013.06.04.11.53.56 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 04 Jun 2013 11:53:57 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 4 Jun 2013 20:52:32 +0200 Message-Id: <1370371954-8479-38-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1370371954-8479-1-git-send-email-pbonzini@redhat.com> References: <1370371954-8479-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:400c:c05::230 Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH 37/39] wdt_i6300esb: 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/watchdog/wdt_i6300esb.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c index 1407fba..b8cfc64 100644 --- a/hw/watchdog/wdt_i6300esb.c +++ b/hw/watchdog/wdt_i6300esb.c @@ -411,8 +411,9 @@ static int i6300esb_init(PCIDevice *dev) return 0; } -static void i6300esb_exit(PCIDevice *dev) +static void i6300esb_instance_finalize(Object *obj) { + PCIDevice *dev = PCI_DEVICE(obj); I6300State *d = DO_UPCAST(I6300State, dev, dev); memory_region_destroy(&d->io_mem); @@ -431,7 +432,6 @@ static void i6300esb_class_init(ObjectClass *klass, void *data) k->config_read = i6300esb_config_read; k->config_write = i6300esb_config_write; k->init = i6300esb_init; - k->exit = i6300esb_exit; k->vendor_id = PCI_VENDOR_ID_INTEL; k->device_id = PCI_DEVICE_ID_INTEL_ESB_9; k->class_id = PCI_CLASS_SYSTEM_OTHER; @@ -444,6 +444,7 @@ static const TypeInfo i6300esb_info = { .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(I6300State), .class_init = i6300esb_class_init, + .instance_finalize = i6300esb_instance_finalize, }; static void i6300esb_register_types(void)