On Mon, Jan 22, 2018 at 7:58 PM, Philippe Mathieu-Daudé <f4...@amsat.org> wrote:
> Create the SDCard in the realize() function.
>
> Suggested-by: Michael Walle <mich...@walle.cc>
> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Reviewed-by: Alistair Francis <alistair.fran...@xilinx.com>
Alistair
> ---
> hw/sd/milkymist-memcard.c | 28 ++++++++++++++++------------
> 1 file changed, 16 insertions(+), 12 deletions(-)
>
> diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c
> index 1292c0c099..a8e65892c7 100644
> --- a/hw/sd/milkymist-memcard.c
> +++ b/hw/sd/milkymist-memcard.c
> @@ -257,27 +257,31 @@ static void milkymist_memcard_reset(DeviceState *d)
> device_reset(DEVICE(s->card));
> }
>
> -static int milkymist_memcard_init(SysBusDevice *dev)
> +static void milkymist_memcard_init(Object *obj)
> +{
> + MilkymistMemcardState *s = MILKYMIST_MEMCARD(obj);
> + SysBusDevice *dev = SYS_BUS_DEVICE(obj);
> +
> + memory_region_init_io(&s->regs_region, OBJECT(s), &memcard_mmio_ops, s,
> + "milkymist-memcard", R_MAX * 4);
> + sysbus_init_mmio(dev, &s->regs_region);
> +}
> +
> +static void milkymist_memcard_realize(DeviceState *dev, Error **errp)
> {
> MilkymistMemcardState *s = MILKYMIST_MEMCARD(dev);
> - DriveInfo *dinfo;
> BlockBackend *blk;
> + DriveInfo *dinfo;
>
> /* FIXME use a qdev drive property instead of drive_get_next() */
> dinfo = drive_get_next(IF_SD);
> blk = dinfo ? blk_by_legacy_dinfo(dinfo) : NULL;
> s->card = sd_init(blk, false);
> if (s->card == NULL) {
> - return -1;
> + error_setg(errp, "failed to init SD card");
> + return;
> }
> -
> s->enabled = blk && blk_is_inserted(blk);
> -
> - memory_region_init_io(&s->regs_region, OBJECT(s), &memcard_mmio_ops, s,
> - "milkymist-memcard", R_MAX * 4);
> - sysbus_init_mmio(dev, &s->regs_region);
> -
> - return 0;
> }
>
> static const VMStateDescription vmstate_milkymist_memcard = {
> @@ -300,9 +304,8 @@ static const VMStateDescription vmstate_milkymist_memcard
> = {
> static void milkymist_memcard_class_init(ObjectClass *klass, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(klass);
> - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
>
> - k->init = milkymist_memcard_init;
> + dc->realize = milkymist_memcard_realize;
> dc->reset = milkymist_memcard_reset;
> dc->vmsd = &vmstate_milkymist_memcard;
> /* Reason: init() method uses drive_get_next() */
> @@ -313,6 +316,7 @@ static const TypeInfo milkymist_memcard_info = {
> .name = TYPE_MILKYMIST_MEMCARD,
> .parent = TYPE_SYS_BUS_DEVICE,
> .instance_size = sizeof(MilkymistMemcardState),
> + .instance_init = milkymist_memcard_init,
> .class_init = milkymist_memcard_class_init,
> };
>
> --
> 2.15.1
>
>
