[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 2/6] hw/sd/milkymist-memcard: split realize()
From: |
Alistair Francis |
Subject: |
Re: [Qemu-devel] [PATCH v2 2/6] hw/sd/milkymist-memcard: split realize() out of SysBusDevice init() |
Date: |
Wed, 31 Jan 2018 08:30:05 -0800 |
On Mon, Jan 22, 2018 at 7:58 PM, Philippe Mathieu-Daudé <address@hidden> wrote:
> Create the SDCard in the realize() function.
>
> Suggested-by: Michael Walle <address@hidden>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
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
>
>
- [Qemu-devel] [PATCH v2 0/6] SDHCI: convert legacy devices to the SDBus API (part 6), Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v2 1/6] hw/sd/milkymist-memcard: use qemu_log_mask(), Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v2 2/6] hw/sd/milkymist-memcard: split realize() out of SysBusDevice init(), Philippe Mathieu-Daudé, 2018/01/22
- Re: [Qemu-devel] [PATCH v2 2/6] hw/sd/milkymist-memcard: split realize() out of SysBusDevice init(),
Alistair Francis <=
- [Qemu-devel] [PATCH v2 3/6] hw/sd/milkymist-memcard: expose a SDBus and connect the SDCard to it, Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v2 4/6] hw/sd/pl181: expose a SDBus and connect the SDCard to it, Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v2 5/6] hw/sd/ssi-sd: use the SDBus API, connect the SDCard to the bus, Philippe Mathieu-Daudé, 2018/01/22
- [Qemu-devel] [PATCH v2 6/6] hw/sd: move sdcard legacy API to "hw/sd/sdcard_legacy.h", Philippe Mathieu-Daudé, 2018/01/22
- Re: [Qemu-devel] [PATCH v2 0/6] SDHCI: convert legacy devices to the SDBus API (part 6), Philippe Mathieu-Daudé, 2018/01/31