saimaa: direct char backend, drop prop dance
This commit is contained in:
+4
-7
@@ -91,11 +91,7 @@ static void saimaa_uart_init(Object *obj)
|
|||||||
|
|
||||||
static void saimaa_uart_realize(DeviceState *dev, Error **errp)
|
static void saimaa_uart_realize(DeviceState *dev, Error **errp)
|
||||||
{
|
{
|
||||||
SaimaaUartState *s = SAIMAA_UART(dev);
|
/* backend wired directly in machine init; nothing to check */
|
||||||
if (!qemu_chr_fe_backend_connected(&s->chr)) {
|
|
||||||
error_setg(errp, "saimaa-uart: chardev property was not set");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---- machine ---- */
|
/* ---- machine ---- */
|
||||||
@@ -148,11 +144,12 @@ static void saimaa_machine_init(MachineState *machine)
|
|||||||
sysbus_mmio_map(SYS_BUS_DEVICE(gic), 0, SAIMAA_GICD_BASE);
|
sysbus_mmio_map(SYS_BUS_DEVICE(gic), 0, SAIMAA_GICD_BASE);
|
||||||
sysbus_mmio_map(SYS_BUS_DEVICE(gic), 1, SAIMAA_GICC_BASE);
|
sysbus_mmio_map(SYS_BUS_DEVICE(gic), 1, SAIMAA_GICC_BASE);
|
||||||
|
|
||||||
/* UART: stdio */
|
/* UART: stdio (direct backend, no property dance) */
|
||||||
DeviceState *uart = qdev_new(TYPE_SAIMAA_UART);
|
DeviceState *uart = qdev_new(TYPE_SAIMAA_UART);
|
||||||
qdev_prop_set_chr(uart, "chardev", serial_hd(0));
|
|
||||||
sysbus_realize(SYS_BUS_DEVICE(uart), &error_fatal);
|
sysbus_realize(SYS_BUS_DEVICE(uart), &error_fatal);
|
||||||
sysbus_mmio_map(SYS_BUS_DEVICE(uart), 0, SAIMAA_UART_BASE);
|
sysbus_mmio_map(SYS_BUS_DEVICE(uart), 0, SAIMAA_UART_BASE);
|
||||||
|
qemu_chr_fe_init(&SAIMAA_UART(uart)->chr, serial_hd(0),
|
||||||
|
&error_abort);
|
||||||
|
|
||||||
/* SDHCI + eMMC image */
|
/* SDHCI + eMMC image */
|
||||||
DeviceState *sdhci = qdev_new(TYPE_SYSBUS_SDHCI);
|
DeviceState *sdhci = qdev_new(TYPE_SYSBUS_SDHCI);
|
||||||
|
|||||||
Reference in New Issue
Block a user