[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/38] ahci: reclaim memory in instance_finalize ins
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 09/38] ahci: reclaim memory in instance_finalize instead of exit |
Date: |
Tue, 3 Sep 2013 14:33:00 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/ide/ahci.c | 2 +-
hw/ide/ahci.h | 2 +-
hw/ide/ich.c | 12 ++++++++----
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index bba150f..8f1d37b 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -1185,7 +1185,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 20e412c..d1d483c 100644
--- a/hw/ide/ahci.h
+++ b/hw/ide/ahci.h
@@ -347,7 +347,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 bff952b..e4f6416 100644
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -140,11 +140,14 @@ static int pci_ich9_ahci_init(PCIDevice *dev)
static void pci_ich9_uninit(PCIDevice *dev)
{
- struct AHCIPCIState *d;
- d = ICH_AHCI(dev);
-
msi_uninit(dev);
- ahci_uninit(&d->ahci);
+}
+
+static void pci_ich9_instance_finalize(Object *obj)
+{
+ struct AHCIPCIState *d = ICH_AHCI(obj);
+
+ ahci_instance_finalize(&d->ahci);
}
static void ich_ahci_class_init(ObjectClass *klass, void *data)
@@ -168,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.3.1
[Qemu-devel] [PATCH 03/38] ac97: use instance_finalize instead of exit, Paolo Bonzini, 2013/09/03
[Qemu-devel] [PATCH 04/38] es1370: use instance_finalize instead of exit, Paolo Bonzini, 2013/09/03
[Qemu-devel] [PATCH 05/38] hda: reclaim memory in instance_finalize instead of exit, Paolo Bonzini, 2013/09/03
[Qemu-devel] [PATCH 07/38] tpci200: use instance_finalize instead of exit, Paolo Bonzini, 2013/09/03
[Qemu-devel] [PATCH 06/38] serial: reclaim memory in instance_finalize instead of exit, Paolo Bonzini, 2013/09/03
[Qemu-devel] [PATCH 08/38] pci-assign: reclaim memory in instance_finalize instead of exit, Paolo Bonzini, 2013/09/03
[Qemu-devel] [PATCH 09/38] ahci: reclaim memory in instance_finalize instead of exit,
Paolo Bonzini <=
[Qemu-devel] [PATCH 10/38] msix: split msix_free from msix_uninit, Paolo Bonzini, 2013/09/03
[Qemu-devel] [PATCH 11/38] cmd646: use instance_finalize instead of exit, Paolo Bonzini, 2013/09/03
[Qemu-devel] [PATCH 12/38] ide/piix: use instance_finalize instead of exit, Paolo Bonzini, 2013/09/03
[Qemu-devel] [PATCH 13/38] ide/via: use instance_finalize instead of exit, Paolo Bonzini, 2013/09/03
[Qemu-devel] [PATCH 14/38] ivshmem: reclaim memory in instance_finalize instead of exit, Paolo Bonzini, 2013/09/03
[Qemu-devel] [PATCH 15/38] pci-testdev: use instance_finalize instead of exit, Paolo Bonzini, 2013/09/03
[Qemu-devel] [PATCH 16/38] vfio: reclaim memory in instance_finalize instead of exit, Paolo Bonzini, 2013/09/03
[Qemu-devel] [PATCH 17/38] e1000: use instance_finalize instead of exit, Paolo Bonzini, 2013/09/03