ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sdhci: refactor common sysbus/pci unrealize() into sdhci_common_unrealize() 

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Message-id: 20180115182436.2066-7-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2018-01-16 13:28:17 +00:00 committed by Peter Maydell
parent 253674981e
commit 8b7455c75e
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hw/sd/sdhci.c
View File

@ -32,6 +32,7 @@
#include "qemu/bitops.h" #include "qemu/bitops.h"
#include "hw/sd/sdhci.h" #include "hw/sd/sdhci.h"
#include "sdhci-internal.h" #include "sdhci-internal.h"
#include "qapi/error.h"
#include "qemu/log.h" #include "qemu/log.h"
/* host controller debug messages */ /* host controller debug messages */
@ -1223,6 +1224,17 @@ static void sdhci_common_realize(SDHCIState *s, Error **errp)
SDHC_REGISTERS_MAP_SIZE); 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) static bool sdhci_pending_insert_vmstate_needed(void *opaque)
{ {
SDHCIState *s = opaque; SDHCIState *s = opaque;
@ -1317,6 +1329,8 @@ static void sdhci_pci_realize(PCIDevice *dev, Error **errp)
static void sdhci_pci_exit(PCIDevice *dev) static void sdhci_pci_exit(PCIDevice *dev)
{ {
SDHCIState *s = PCI_SDHCI(dev); SDHCIState *s = PCI_SDHCI(dev);
sdhci_common_unrealize(s, &error_abort);
sdhci_uninitfn(s); sdhci_uninitfn(s);
} }
@ -1382,12 +1396,20 @@ static void sdhci_sysbus_realize(DeviceState *dev, Error ** errp)
sysbus_init_mmio(sbd, &s->iomem); 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) static void sdhci_sysbus_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
dc->props = sdhci_sysbus_properties; dc->props = sdhci_sysbus_properties;
dc->realize = sdhci_sysbus_realize; dc->realize = sdhci_sysbus_realize;
dc->unrealize = sdhci_sysbus_unrealize;
sdhci_common_class_init(klass, data); sdhci_common_class_init(klass, data);
} }