From patchwork Tue Jun 4 18:52:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 248843 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 472AC2C0040 for ; Wed, 5 Jun 2013 05:12:29 +1000 (EST) Received: from localhost ([::1]:38612 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ujweh-0003Ap-Ap for incoming@patchwork.ozlabs.org; Tue, 04 Jun 2013 15:12:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwMh-0000AK-0e for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UjwMg-0007qk-15 for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:50 -0400 Received: from mail-we0-x230.google.com ([2a00:1450:400c:c03::230]:33592) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UjwMf-0007qZ-Pr for qemu-devel@nongnu.org; Tue, 04 Jun 2013 14:53:49 -0400 Received: by mail-we0-f176.google.com with SMTP id t56so537805wes.21 for ; Tue, 04 Jun 2013 11:53:49 -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=L3CdAzok6NJhaCJJHxjNO50PTpp5qkcLQ1KaCvcY2Kk=; b=G2uwt49RCPX08tMTTIgOvUWgHJ8ALak05aYgthPAzyTOEnSvZ+qaeR5VqVLi5OMi6q TtPvhggr/yB4C8xMVaXhYqxmhA8VASJlCa3B536dzBUKqAbZeb9dTZo3GyXj+mn1FPQI qApXubSNYCc6Xl25ATzBg/uSsHf9AO3oU8hDxOCMax8gm2We1lWGKdNu9IAl+fnv3bhM q5ss5+nT2ElduXul93ETg8ZFlu3CGKlXMWt2vLwgb35vkUd5OPteubCgP/bU5o6KKN7b gqszWnzflOAcZUPnOZyhHker7qfFzk7+ePfAyk6djjNc1oLPn2cv0Wc2aG1LEFw8vDsy fbzg== X-Received: by 10.194.157.65 with SMTP id wk1mr14714702wjb.8.1370372029115; Tue, 04 Jun 2013 11:53:49 -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.47 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 04 Jun 2013 11:53:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 4 Jun 2013 20:52:27 +0200 Message-Id: <1370371954-8479-33-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::230 Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH 32/39] esp: 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/scsi/esp-pci.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c index 029789a..4fe3445 100644 --- a/hw/scsi/esp-pci.c +++ b/hw/scsi/esp-pci.c @@ -361,8 +361,9 @@ static int esp_pci_scsi_init(PCIDevice *dev) return 0; } -static void esp_pci_scsi_uninit(PCIDevice *d) +static void esp_pci_scsi_instance_finalize(Object *obj) { + PCIDevice *d = PCI_DEVICE(obj); PCIESPState *pci = DO_UPCAST(PCIESPState, dev, d); memory_region_destroy(&pci->io); @@ -374,7 +375,6 @@ static void esp_pci_class_init(ObjectClass *klass, void *data) PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); k->init = esp_pci_scsi_init; - k->exit = esp_pci_scsi_uninit; k->vendor_id = PCI_VENDOR_ID_AMD; k->device_id = PCI_DEVICE_ID_AMD_SCSI; k->revision = 0x10; @@ -389,6 +389,7 @@ static const TypeInfo esp_pci_info = { .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PCIESPState), .class_init = esp_pci_class_init, + .instance_finalize = esp_pci_scsi_instance_finalize, }; typedef struct {