[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 07/17] sdhci: refactor common sysbus/pci unrealiz
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v4 07/17] sdhci: refactor common sysbus/pci unrealize() into sdhci_unrealizefn() |
Date: |
Wed, 3 Jan 2018 08:01:16 -0300 |
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/sd/sdhci.c | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index d5c6d8ab0b..967521d347 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -32,6 +32,7 @@
#include "qapi/error.h"
#include "hw/sd/sdhci.h"
#include "sdhci-internal.h"
+#include "qapi/error.h"
#include "qemu/log.h"
/* host controller debug messages */
@@ -1204,15 +1205,23 @@ 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);
+ /* 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!). */
+ s->fifo_buffer = NULL;
+}
+
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);
-
- g_free(s->fifo_buffer);
- s->fifo_buffer = NULL;
}
static bool sdhci_pending_insert_vmstate_needed(void *opaque)
@@ -1318,6 +1327,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);
}
@@ -1376,11 +1387,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, &error_abort);
+}
+
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 v4 00/17] SDHCI: housekeeping, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 01/17] sdhci: clean up includes, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 03/17] sdhci: remove dead code, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 02/17] sdhci: sort registers comments, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 04/17] sdhci: refactor same sysbus/pci properties into a common one, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 05/17] sdhci: refactor common sysbus/pci class_init() into sdhci_class_init(), Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 07/17] sdhci: refactor common sysbus/pci unrealize() into sdhci_unrealizefn(),
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v4 06/17] sdhci: refactor common sysbus/pci realize() into sdhci_realizefn(), Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 08/17] sdhci: use qemu_log_mask(UNIMP) instead of fprintf(), Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 09/17] sdhci: convert the DPRINT() calls into trace events, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 10/17] sdhci: add a GPIO for the 'access control' LED, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 11/17] sdhci: move MASK_TRNMOD with other SDHC_TRN* defines in "sd-internal.h", Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 12/17] sdhci: use FIELD_DP32() macro for the WRITE_PROTECT flag, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 13/17] sdhci: rename the SDHC_CAPAB register, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 14/17] sdhci: fix CAPAB/MAXCURR registers, both are 64bit and read-only, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 15/17] sdhci: Implement write method of ACMD12ERRSTS register, Philippe Mathieu-Daudé, 2018/01/03