@@ -1073,21 +1073,18 @@ SerialMM *serial_mm_init(MemoryRegion *address_space,
Chardev *chr, enum device_endian end)
{
SerialMM *smm = SERIAL_MM(qdev_create(NULL, TYPE_SERIAL_MM));
- SerialState *s = &smm->serial;
+ MemoryRegion *mr;
qdev_prop_set_uint8(DEVICE(smm), "regshift", regshift);
- s->irq = irq;
- qdev_prop_set_uint32(DEVICE(s), "baudbase", baudbase);
- qdev_prop_set_chr(DEVICE(s), "chardev", chr);
- qdev_set_legacy_instance_id(DEVICE(s), base, 2);
- qdev_prop_set_uint8(DEVICE(self), "endianness", end);
-
- qdev_init_nofail(DEVICE(s));
+ qdev_prop_set_uint32(DEVICE(smm), "baudbase", baudbase);
+ qdev_prop_set_chr(DEVICE(smm), "chardev", chr);
+ qdev_set_legacy_instance_id(DEVICE(smm), base, 2);
+ qdev_prop_set_uint8(DEVICE(smm), "endianness", end);
qdev_init_nofail(DEVICE(smm));
- memory_region_init_io(&s->io, NULL, &serial_mm_ops[end], smm,
- "serial", 8 << regshift);
- memory_region_add_subregion(address_space, base, &s->io);
+ sysbus_connect_irq(SYS_BUS_DEVICE(smm), 0, irq);
+ mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(smm), 0);
+ memory_region_add_subregion(address_space, base, mr);
return smm;
}
@@ -1098,6 +1095,8 @@ static void serial_mm_instance_init(Object *o)
object_initialize_child(o, "serial", &smm->serial, sizeof(smm->serial),
TYPE_SERIAL, &error_abort, NULL);
+
+ qdev_alias_all_properties(DEVICE(&smm->serial), o);
}
static Property serial_mm_properties[] = {
@@ -1111,11 +1110,25 @@ static Property serial_mm_properties[] = {
DEFINE_PROP_END_OF_LIST(),
};
+static void serial_mm_realize(DeviceState *dev, Error **errp)
+{
+ SerialMM *smm = SERIAL_MM(dev);
+ SerialState *s = &smm->serial;
+
+ qdev_init_nofail(DEVICE(s));
+
+ memory_region_init_io(&s->io, NULL, &serial_mm_ops[smm->endianness], smm,
+ "serial", 8 << smm->regshift);
+ sysbus_init_mmio(SYS_BUS_DEVICE(smm), &s->io);
+ sysbus_init_irq(SYS_BUS_DEVICE(smm), &smm->serial.irq);
+}
+
static void serial_mm_class_init(ObjectClass *klass, void* data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
dc->props = serial_mm_properties;
+ dc->realize = serial_mm_realize;
}
static const TypeInfo serial_mm_info = {