[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/20] sdhci: refactor common sysbus/pci unrealiz
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v2 07/20] sdhci: refactor common sysbus/pci unrealize() into sdhci_unrealizefn() |
Date: |
Fri, 15 Dec 2017 00:15:34 -0300 |
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/sd/sdhci.c | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index f574495b19..53c1f11855 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -31,6 +31,7 @@
#include "qemu/bitops.h"
#include "hw/sd/sdhci.h"
#include "sdhci-internal.h"
+#include "qapi/error.h"
#include "qemu/log.h"
/* host controller debug messages */
@@ -1200,17 +1201,20 @@ static void sdhci_realizefn(SDHCIState *s, Error **errp)
SDHC_REGISTERS_MAP_SIZE);
}
+static void sdhci_unrealizefn(SDHCIState *s, Error **errp)
+{
+ g_free(s->fifo_buffer);
+}
+
static void sdhci_uninitfn(SDHCIState *s)
{
timer_del(s->insert_timer);
timer_free(s->insert_timer);
timer_del(s->transfer_timer);
timer_free(s->transfer_timer);
+
qemu_free_irq(s->eject_cb);
qemu_free_irq(s->ro_cb);
-
- g_free(s->fifo_buffer);
- s->fifo_buffer = NULL;
}
static bool sdhci_pending_insert_vmstate_needed(void *opaque)
@@ -1311,6 +1315,8 @@ static void sdhci_pci_realize(PCIDevice *dev, Error
**errp)
static void sdhci_pci_exit(PCIDevice *dev)
{
SDHCIState *s = PCI_SDHCI(dev);
+
+ sdhci_unrealizefn(s, &error_abort);
sdhci_uninitfn(s);
}
@@ -1364,11 +1370,19 @@ static void sdhci_sysbus_realize(DeviceState *dev,
Error ** errp)
sysbus_init_mmio(sbd, &s->iomem);
}
+static void sdhci_sysbus_unrealize(DeviceState *dev, Error **errp)
+{
+ SDHCIState *s = SYSBUS_SDHCI(dev);
+
+ sdhci_unrealizefn(s, errp);
+}
+
static void sdhci_sysbus_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
dc->realize = sdhci_sysbus_realize;
+ dc->unrealize = sdhci_sysbus_unrealize;
sdhci_class_init(klass, data);
}
--
2.15.1
- [Qemu-devel] [PATCH v2 00/20] SDHCI: housekeeping, add a qtest and fix few issues, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 01/20] sdhci: clean up includes, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 02/20] sdhci: use deposit64(), Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 03/20] sdhci: move MASK_TRNMOD with other SDHC_TRN* defines in "sd-internal.h", Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 04/20] sdhci: refactor same sysbus/pci properties into a common one, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 05/20] sdhci: refactor common sysbus/pci realize() into sdhci_realizefn(), Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 06/20] sdhci: refactor common sysbus/pci class_init() into sdhci_class_init(), Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 07/20] sdhci: refactor common sysbus/pci unrealize() into sdhci_unrealizefn(),
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v2 08/20] sdhci: use qemu_log_mask(UNIMP) instead of fprintf(), Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 09/20] sdhci: convert the DPRINT() calls into trace events, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 10/20] sdhci: add a GPIO for the access control LED, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 11/20] sdhci: add a "dma-memory" property, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 12/20] sdhci: fix CAPAB/MAXCURR registers, both are 64bit and read-only, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 13/20] sdhci: Implement write method of ACMD12ERRSTS register, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 14/20] sdhci: add a "sd-spec-version" property, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-devel] [PATCH v2 15/20] sdhci: some ARM boards do support SD_HOST_SPECv3_VERS, Philippe Mathieu-Daudé, 2017/12/14