From mboxrd@z Thu Jan 1 00:00:00 1970 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) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 4 Jun 2013 20:52:32 +0200 Message-Id: <1370371954-8479-38-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 37/39] wdt_i6300esb: 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/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) -- 1.8.1.4