From patchwork Tue Jun 4 18:52:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 248833 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 7B1102C009A for ; Wed, 5 Jun 2013 05:04:11 +1000 (EST) Received: from localhost ([::1]:44874 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwWf-00081N-EY for incoming@patchwork.ozlabs.org; Tue, 04 Jun 2013 15:04:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53368) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwM8-0007WK-BU for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UjwM7-0007bi-E9 for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:16 -0400 Received: from mail-we0-x233.google.com ([2a00:1450:400c:c03::233]:54331) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwM7-0007b3-7l for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:15 -0400 Received: by mail-we0-f179.google.com with SMTP id w59so534222wes.24 for ; Tue, 04 Jun 2013 11:53:14 -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=1tF1gkxi0RhKx1SLVY0GxbS4KMkjQeOrwFa1wzNmuCY=; b=AIe2BDOq1C6fsyXUwF7rEgp9P5mqwYkSRaeuHJtGDRw/qE2nEEo3gKlAW/eFqZAtF0 zftBH20RxjZJ7kUdyHy8ja/ELci6Ab2N+YqE1qI1J83ypW6lhDg2cRBbKOoVIZSdOp4A xVt9CN+G/upNFT7Kje8KKNMuFrjEAZ7Jse7iSodWdfyD/LPzVo7rvnRFeVzE+jLgfxbK XAQkTabDrJYQPQMhHAXoztuzzUjrFjfCDfEv4Nkqe3pHjCpGLKNPnwThOMTJPKSvVTGF iKoz71hACr4au8FeYuR2Kbt/TQA8vPqNmmkfIHx+ydfoc68iAEFe95rXvBzZE9wwY+UV fRqQ== X-Received: by 10.194.19.3 with SMTP id a3mr19896274wje.54.1370371994490; Tue, 04 Jun 2013 11:53:14 -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.12 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 04 Jun 2013 11:53:13 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 4 Jun 2013 20:52:09 +0200 Message-Id: <1370371954-8479-15-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:c03::233 Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH 14/39] ide/via: 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/ide/via.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/ide/via.c b/hw/ide/via.c index 5fe053c..58070df 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -190,8 +190,9 @@ static int vt82c686b_ide_initfn(PCIDevice *dev) return 0; } -static void vt82c686b_ide_exitfn(PCIDevice *dev) +static void vt82c686b_ide_instance_finalize(Object *obj) { + PCIDevice *dev = PCI_DEVICE(obj); PCIIDEState *d = DO_UPCAST(PCIIDEState, dev, dev); unsigned i; @@ -218,7 +219,6 @@ static void via_ide_class_init(ObjectClass *klass, void *data) PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); k->init = vt82c686b_ide_initfn; - k->exit = vt82c686b_ide_exitfn; k->vendor_id = PCI_VENDOR_ID_VIA; k->device_id = PCI_DEVICE_ID_VIA_IDE; k->revision = 0x06; @@ -231,6 +231,7 @@ static const TypeInfo via_ide_info = { .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIIDEState), .class_init = via_ide_class_init, + .instance_finalize = vt82c686b_ide_instance_finalize, }; static void via_ide_register_types(void)