[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v8 06/14] sdhci: refactor common sysbus/pci unrealiz
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v8 06/14] sdhci: refactor common sysbus/pci unrealize() into sdhci_common_unrealize() |
Date: |
Mon, 15 Jan 2018 15:24:28 -0300 |
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
---
hw/sd/sdhci.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index cf0c079990..bbe4570326 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -32,6 +32,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 */
@@ -1223,6 +1224,17 @@ static void sdhci_common_realize(SDHCIState *s, Error
**errp)
SDHC_REGISTERS_MAP_SIZE);
}
+static void sdhci_common_unrealize(SDHCIState *s, Error **errp)
+{
+ /* This function is expected to be called only once for each class:
+ * - SysBus: via DeviceClass->unrealize(),
+ * - PCI: via PCIDeviceClass->exit().
+ * However to avoid double-free and/or use-after-free we still nullify
+ * this variable (better safe than sorry!). */
+ g_free(s->fifo_buffer);
+ s->fifo_buffer = NULL;
+}
+
static bool sdhci_pending_insert_vmstate_needed(void *opaque)
{
SDHCIState *s = opaque;
@@ -1317,6 +1329,8 @@ static void sdhci_pci_realize(PCIDevice *dev, Error
**errp)
static void sdhci_pci_exit(PCIDevice *dev)
{
SDHCIState *s = PCI_SDHCI(dev);
+
+ sdhci_common_unrealize(s, &error_abort);
sdhci_uninitfn(s);
}
@@ -1382,12 +1396,20 @@ 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_common_unrealize(s, &error_abort);
+}
+
static void sdhci_sysbus_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
dc->props = sdhci_sysbus_properties;
dc->realize = sdhci_sysbus_realize;
+ dc->unrealize = sdhci_sysbus_unrealize;
sdhci_common_class_init(klass, data);
}
--
2.15.1
- [Qemu-devel] [PATCH v8 00/14] SDHCI: housekeeping (part 1), Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v8 01/14] sdhci: clean up includes, Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v8 02/14] sdhci: remove dead code, Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v8 03/14] sdhci: use DEFINE_SDHCI_COMMON_PROPERTIES() for common sysbus/pci properties, Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v8 04/14] sdhci: refactor common sysbus/pci class_init() into sdhci_common_class_init(), Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v8 05/14] sdhci: refactor common sysbus/pci realize() into sdhci_common_realize(), Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v8 06/14] sdhci: refactor common sysbus/pci unrealize() into sdhci_common_unrealize(),
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v8 07/14] sdhci: use qemu_log_mask(UNIMP) instead of fprintf(), Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v8 08/14] sdhci: convert the DPRINT() calls into trace events, Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v8 09/14] sdhci: move MASK_TRNMOD with other SDHC_TRN* defines in "sd-internal.h", Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v8 10/14] sdhci: rename the SDHC_CAPAB register, Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v8 11/14] sdhci: fix CAPAB/MAXCURR registers, both are 64bit and read-only, Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v8 12/14] sdhci: Implement write method of ACMD12ERRSTS register, Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v8 13/14] sdhci: fix the PCI device, using the PCI address space for DMA, Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v8 14/14] sdhci: add a 'dma' property to the sysbus devices, Philippe Mathieu-Daudé, 2018/01/15
- Re: [Qemu-devel] [PATCH v8 00/14] SDHCI: housekeeping (part 1), Peter Maydell, 2018/01/16