| Message ID | 20230203145536.17585-12-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw: Use QOM alias properties and few QOM/QDev cleanups | expand |
On Fri, 3 Feb 2023, Philippe Mathieu-Daudé wrote: > No need to use an intermediate 'dma-offset' property in the > chipset object. Alias the property, so when the machine (here > r2d-plus) sets the value on the chipset, it is propagated to > the OHCI object. > > Note we can rename the chipset 'base' property as 'dma-offset' > since the object is a non-user-creatable sysbus type. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu> > --- > hw/display/sm501.c | 7 ++----- > hw/sh4/r2d.c | 2 +- > 2 files changed, 3 insertions(+), 6 deletions(-) > > diff --git a/hw/display/sm501.c b/hw/display/sm501.c > index 0f7e09d7e2..efebd93f1e 100644 > --- a/hw/display/sm501.c > +++ b/hw/display/sm501.c > @@ -1943,7 +1943,6 @@ struct SM501SysBusState { > /*< public >*/ > SM501State state; > uint32_t vram_size; > - uint32_t base; > SerialMM serial; > OHCISysBusState ohci; > }; > @@ -1964,7 +1963,6 @@ static void sm501_realize_sysbus(DeviceState *dev, Error **errp) > sysbus_init_mmio(sbd, &s->state.mmio_region); > > /* bridge to usb host emulation module */ > - qdev_prop_set_uint64(DEVICE(&s->ohci), "dma-offset", s->base); > sysbus_realize_and_unref(SYS_BUS_DEVICE(&s->ohci), &error_fatal); > memory_region_add_subregion(&s->state.mmio_region, SM501_USB_HOST, > sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->ohci), 0)); > @@ -1979,7 +1977,6 @@ static void sm501_realize_sysbus(DeviceState *dev, Error **errp) > > static Property sm501_sysbus_properties[] = { > DEFINE_PROP_UINT32("vram-size", SM501SysBusState, vram_size, 0), > - DEFINE_PROP_UINT32("base", SM501SysBusState, base, 0), > DEFINE_PROP_END_OF_LIST(), > }; > > @@ -2019,6 +2016,7 @@ static void sm501_sysbus_init(Object *o) > SerialMM *smm = &sm501->serial; > > object_initialize_child(o, "ohci", ohci, TYPE_SYSBUS_OHCI); > + object_property_add_alias(o, "dma-offset", OBJECT(ohci), "dma-offset"); > qdev_prop_set_uint32(DEVICE(ohci), "num-ports", 2); > > object_initialize_child(o, "serial", smm, TYPE_SERIAL_MM); > @@ -2026,8 +2024,7 @@ static void sm501_sysbus_init(Object *o) > qdev_prop_set_uint8(DEVICE(smm), "regshift", 2); > qdev_prop_set_uint8(DEVICE(smm), "endianness", DEVICE_LITTLE_ENDIAN); > > - object_property_add_alias(o, "chardev", > - OBJECT(smm), "chardev"); > + object_property_add_alias(o, "chardev", OBJECT(smm), "chardev"); > } > > static const TypeInfo sm501_sysbus_info = { > diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c > index 39fc4f19d9..d7020d6d2b 100644 > --- a/hw/sh4/r2d.c > +++ b/hw/sh4/r2d.c > @@ -274,7 +274,7 @@ static void r2d_init(MachineState *machine) > dev = qdev_new("sysbus-sm501"); > busdev = SYS_BUS_DEVICE(dev); > qdev_prop_set_uint32(dev, "vram-size", SM501_VRAM_SIZE); > - qdev_prop_set_uint32(dev, "base", 0x10000000); > + qdev_prop_set_uint64(dev, "dma-offset", 0x10000000); > qdev_prop_set_chr(dev, "chardev", serial_hd(2)); > sysbus_realize_and_unref(busdev, &error_fatal); > sysbus_mmio_map(busdev, 0, 0x10000000); >
Philippe Mathieu-Daudé <philmd@linaro.org> writes: > No need to use an intermediate 'dma-offset' property in the > chipset object. Alias the property, so when the machine (here > r2d-plus) sets the value on the chipset, it is propagated to > the OHCI object. > > Note we can rename the chipset 'base' property as 'dma-offset' > since the object is a non-user-creatable sysbus type. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> This has become commit 6a015046606ebf260950605ec48fc6420422f43c.
diff --git a/hw/display/sm501.c b/hw/display/sm501.c index 0f7e09d7e2..efebd93f1e 100644 --- a/hw/display/sm501.c +++ b/hw/display/sm501.c @@ -1943,7 +1943,6 @@ struct SM501SysBusState { /*< public >*/ SM501State state; uint32_t vram_size; - uint32_t base; SerialMM serial; OHCISysBusState ohci; }; @@ -1964,7 +1963,6 @@ static void sm501_realize_sysbus(DeviceState *dev, Error **errp) sysbus_init_mmio(sbd, &s->state.mmio_region); /* bridge to usb host emulation module */ - qdev_prop_set_uint64(DEVICE(&s->ohci), "dma-offset", s->base); sysbus_realize_and_unref(SYS_BUS_DEVICE(&s->ohci), &error_fatal); memory_region_add_subregion(&s->state.mmio_region, SM501_USB_HOST, sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->ohci), 0)); @@ -1979,7 +1977,6 @@ static void sm501_realize_sysbus(DeviceState *dev, Error **errp) static Property sm501_sysbus_properties[] = { DEFINE_PROP_UINT32("vram-size", SM501SysBusState, vram_size, 0), - DEFINE_PROP_UINT32("base", SM501SysBusState, base, 0), DEFINE_PROP_END_OF_LIST(), }; @@ -2019,6 +2016,7 @@ static void sm501_sysbus_init(Object *o) SerialMM *smm = &sm501->serial; object_initialize_child(o, "ohci", ohci, TYPE_SYSBUS_OHCI); + object_property_add_alias(o, "dma-offset", OBJECT(ohci), "dma-offset"); qdev_prop_set_uint32(DEVICE(ohci), "num-ports", 2); object_initialize_child(o, "serial", smm, TYPE_SERIAL_MM); @@ -2026,8 +2024,7 @@ static void sm501_sysbus_init(Object *o) qdev_prop_set_uint8(DEVICE(smm), "regshift", 2); qdev_prop_set_uint8(DEVICE(smm), "endianness", DEVICE_LITTLE_ENDIAN); - object_property_add_alias(o, "chardev", - OBJECT(smm), "chardev"); + object_property_add_alias(o, "chardev", OBJECT(smm), "chardev"); } static const TypeInfo sm501_sysbus_info = { diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c index 39fc4f19d9..d7020d6d2b 100644 --- a/hw/sh4/r2d.c +++ b/hw/sh4/r2d.c @@ -274,7 +274,7 @@ static void r2d_init(MachineState *machine) dev = qdev_new("sysbus-sm501"); busdev = SYS_BUS_DEVICE(dev); qdev_prop_set_uint32(dev, "vram-size", SM501_VRAM_SIZE); - qdev_prop_set_uint32(dev, "base", 0x10000000); + qdev_prop_set_uint64(dev, "dma-offset", 0x10000000); qdev_prop_set_chr(dev, "chardev", serial_hd(2)); sysbus_realize_and_unref(busdev, &error_fatal); sysbus_mmio_map(busdev, 0, 0x10000000);
No need to use an intermediate 'dma-offset' property in the chipset object. Alias the property, so when the machine (here r2d-plus) sets the value on the chipset, it is propagated to the OHCI object. Note we can rename the chipset 'base' property as 'dma-offset' since the object is a non-user-creatable sysbus type. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/display/sm501.c | 7 ++----- hw/sh4/r2d.c | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-)