Oops I sent this patch too fast.
On Wed, Jan 3, 2018 at 8:01 AM, Philippe Mathieu-Daudé <f4...@amsat.org> wrote:
> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> Reviewed-by: Alistair Francis <alistair.fran...@xilinx.com>
> ---
> hw/sd/sdhci.c | 35 ++++++++++++++++++++++++++---------
> 1 file changed, 26 insertions(+), 9 deletions(-)
>
> diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
> index 38d82b4c61..d5c6d8ab0b 100644
> --- a/hw/sd/sdhci.c
> +++ b/hw/sd/sdhci.c
> @@ -29,6 +29,7 @@
> #include "sysemu/dma.h"
> #include "qemu/timer.h"
> #include "qemu/bitops.h"
> +#include "qapi/error.h"
> #include "hw/sd/sdhci.h"
> #include "sdhci-internal.h"
> #include "qemu/log.h"
> @@ -1194,6 +1195,15 @@ static void sdhci_initfn(SDHCIState *s)
> s->transfer_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
> sdhci_data_transfer, s);
> }
>
> +static void sdhci_realizefn(SDHCIState *s, Error **errp)
> +{
> + s->buf_maxsz = sdhci_get_fifolen(s);
> + s->fifo_buffer = g_malloc0(s->buf_maxsz);
> +
> + memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci",
> + SDHC_REGISTERS_MAP_SIZE);
> +}
> +
> static void sdhci_uninitfn(SDHCIState *s)
> {
> timer_del(s->insert_timer);
> @@ -1290,14 +1300,18 @@ static void sdhci_class_init(ObjectClass *klass, void
> *data)
> static void sdhci_pci_realize(PCIDevice *dev, Error **errp)
> {
> SDHCIState *s = PCI_SDHCI(dev);
> + Error *err_local = NULL;
> +
> + sdhci_initfn(s);
> + sdhci_realizefn(s, errp);
^ &err_local
> + if (errp) {
^ err_local
> + error_propagate(errp, err_local);
> + return;
> + }
> +
> dev->config[PCI_CLASS_PROG] = 0x01; /* Standard Host supported DMA */
> dev->config[PCI_INTERRUPT_PIN] = 0x01; /* interrupt pin A */
> - sdhci_initfn(s);
> - s->buf_maxsz = sdhci_get_fifolen(s);
> - s->fifo_buffer = g_malloc0(s->buf_maxsz);
> s->irq = pci_allocate_irq(dev);
> - memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci",
> - SDHC_REGISTERS_MAP_SIZE);
> pci_register_bar(dev, 0, 0, &s->iomem);
> }
>
> @@ -1350,12 +1364,15 @@ static void sdhci_sysbus_realize(DeviceState *dev,
> Error ** errp)
> {
> SDHCIState *s = SYSBUS_SDHCI(dev);
> SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
> + Error *err_local = NULL;
> +
> + sdhci_realizefn(s, &err_local);
> + if (errp) {
^ err_local
> + error_propagate(errp, err_local);
> + return;
> + }
>
> - s->buf_maxsz = sdhci_get_fifolen(s);
> - s->fifo_buffer = g_malloc0(s->buf_maxsz);
> sysbus_init_irq(sbd, &s->irq);
> - memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci",
> - SDHC_REGISTERS_MAP_SIZE);
> sysbus_init_mmio(sbd, &s->iomem);
> }
>
> --
> 2.15.1
>
