[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/39] ahci: split exit and instance_finalize
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 10/39] ahci: split exit and instance_finalize |
Date: |
Tue, 4 Jun 2013 20:52:05 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/ide/ahci.c | 2 +-
hw/ide/ahci.h | 2 +-
hw/ide/ich.c | 13 +++++++++----
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 6b87549..083e0f4 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -1174,7 +1174,7 @@ void ahci_init(AHCIState *s, DeviceState *qdev,
AddressSpace *as, int ports)
}
}
-void ahci_uninit(AHCIState *s)
+void ahci_instance_finalize(AHCIState *s)
{
memory_region_destroy(&s->mem);
memory_region_destroy(&s->idp);
diff --git a/hw/ide/ahci.h b/hw/ide/ahci.h
index 341a571..b2197c2 100644
--- a/hw/ide/ahci.h
+++ b/hw/ide/ahci.h
@@ -339,7 +339,7 @@ typedef struct NCQFrame {
} QEMU_PACKED NCQFrame;
void ahci_init(AHCIState *s, DeviceState *qdev, AddressSpace *as, int ports);
-void ahci_uninit(AHCIState *s);
+void ahci_instance_finalize(AHCIState *s);
void ahci_reset(AHCIState *s);
diff --git a/hw/ide/ich.c b/hw/ide/ich.c
index 6c0c0c2..7c8c672 100644
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -140,11 +140,15 @@ static int pci_ich9_ahci_init(PCIDevice *dev)
static void pci_ich9_uninit(PCIDevice *dev)
{
- struct AHCIPCIState *d;
- d = DO_UPCAST(struct AHCIPCIState, card, dev);
-
msi_uninit(dev);
- ahci_uninit(&d->ahci);
+}
+
+static void pci_ich9_instance_finalize(Object *obj)
+{
+ PCIDevice *dev = PCI_DEVICE(obj);
+ struct AHCIPCIState *d = DO_UPCAST(struct AHCIPCIState, card, dev);
+
+ ahci_instance_finalize(&d->ahci);
}
static void ich_ahci_class_init(ObjectClass *klass, void *data)
@@ -167,6 +171,7 @@ static const TypeInfo ich_ahci_info = {
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(AHCIPCIState),
.class_init = ich_ahci_class_init,
+ .instance_finalize = pci_ich9_instance_finalize,
};
static void ich_ahci_register_types(void)
--
1.8.1.4
- Re: [Qemu-devel] [PATCH 02/39] dma: keep a device alive while it has SGLists, (continued)
- [Qemu-devel] [PATCH 03/39] pci: split exit and finalize, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 04/39] ac97: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 05/39] es1370: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 06/39] hda: split exit and instance_finalize, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 07/39] serial: split exit and instance_finalize, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 08/39] tpci200: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 09/39] pci-assign: split exit and instance_finalize, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 10/39] ahci: split exit and instance_finalize,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 11/39] msix: split msix_free from msix_uninit, Paolo Bonzini, 2013/06/04
- Re: [Qemu-devel] [PATCH 11/39] msix: split msix_free from msix_uninit, Michael S. Tsirkin, 2013/06/04
- Re: [Qemu-devel] [PATCH 11/39] msix: split msix_free from msix_uninit, Paolo Bonzini, 2013/06/04
- Re: [Qemu-devel] [PATCH 11/39] msix: split msix_free from msix_uninit, Michael S. Tsirkin, 2013/06/05
- Re: [Qemu-devel] [PATCH 11/39] msix: split msix_free from msix_uninit, Paolo Bonzini, 2013/06/05
- Re: [Qemu-devel] [PATCH 11/39] msix: split msix_free from msix_uninit, Michael S. Tsirkin, 2013/06/05
- Re: [Qemu-devel] [PATCH 11/39] msix: split msix_free from msix_uninit, Paolo Bonzini, 2013/06/06
[Qemu-devel] [PATCH 12/39] cmd646: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04
[Qemu-devel] [PATCH 13/39] ide/piix: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04
[Qemu-devel] [PATCH 14/39] ide/via: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04