[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/4] hw/sd/milkymist: Create the SDBus at init()
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 3/4] hw/sd/milkymist: Create the SDBus at init() |
Date: |
Sun, 5 Jul 2020 23:10:15 +0200 |
We don't need to wait until realize() to create the SDBus,
create it in init() directly.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/sd/milkymist-memcard.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c
index afdb8aa0c0..fb02309f07 100644
--- a/hw/sd/milkymist-memcard.c
+++ b/hw/sd/milkymist-memcard.c
@@ -261,6 +261,9 @@ static void milkymist_memcard_init(Object *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);
+
+ qbus_create_inplace(&s->sdbus, sizeof(s->sdbus), TYPE_SD_BUS,
+ DEVICE(obj), "sd-bus");
}
static void milkymist_memcard_realize(DeviceState *dev, Error **errp)
@@ -271,9 +274,6 @@ static void milkymist_memcard_realize(DeviceState *dev,
Error **errp)
DriveInfo *dinfo;
Error *err = NULL;
- qbus_create_inplace(&s->sdbus, sizeof(s->sdbus), TYPE_SD_BUS,
- dev, "sd-bus");
-
/* Create and plug in the sd card */
/* FIXME use a qdev drive property instead of drive_get_next() */
dinfo = drive_get_next(IF_SD);
--
2.21.3
- [PATCH 2/4] hw/lm32/milkymist: Comment to remember some IRQs lines are left unwired, (continued)
Re: [PATCH 2/4] hw/lm32/milkymist: Comment to remember some IRQs lines are left unwired, Peter Maydell, 2020/07/07
[PATCH 1/4] hw/lm32/milkymist: Un-inline milkymist_memcard_create(), Philippe Mathieu-Daudé, 2020/07/05
[PATCH 3/4] hw/sd/milkymist: Create the SDBus at init(),
Philippe Mathieu-Daudé <=
[PATCH 4/4] hw/sd/milkymist: Do not create SD card within the SDHCI controller, Philippe Mathieu-Daudé, 2020/07/05