Message ID | 20231017140150.44995-7-philmd@linaro.org |
---|---|
State | Superseded |
Headers | show |
Series | hw: Few more QOM/QDev cleanups | expand |
On 17/10/2023 15:01, Philippe Mathieu-Daudé wrote: > Declare link statically using DEFINE_PROP_LINK(). > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > hw/net/cadence_gem.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c > index f445d8bb5e..37e209cda6 100644 > --- a/hw/net/cadence_gem.c > +++ b/hw/net/cadence_gem.c > @@ -1654,11 +1654,6 @@ static void gem_init(Object *obj) > "enet", sizeof(s->regs)); > > sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); > - > - object_property_add_link(obj, "dma", TYPE_MEMORY_REGION, > - (Object **)&s->dma_mr, > - qdev_prop_allow_set_link_before_realize, > - OBJ_PROP_LINK_STRONG); > } > > static const VMStateDescription vmstate_cadence_gem = { > @@ -1691,6 +1686,8 @@ static Property gem_properties[] = { > num_type2_screeners, 4), > DEFINE_PROP_UINT16("jumbo-max-len", CadenceGEMState, > jumbo_max_len, 10240), > + DEFINE_PROP_LINK("dma", CadenceGEMState, dma_mr, > + TYPE_MEMORY_REGION, MemoryRegion *), > DEFINE_PROP_END_OF_LIST(), > }; Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> ATB, Mark.
diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index f445d8bb5e..37e209cda6 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -1654,11 +1654,6 @@ static void gem_init(Object *obj) "enet", sizeof(s->regs)); sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); - - object_property_add_link(obj, "dma", TYPE_MEMORY_REGION, - (Object **)&s->dma_mr, - qdev_prop_allow_set_link_before_realize, - OBJ_PROP_LINK_STRONG); } static const VMStateDescription vmstate_cadence_gem = { @@ -1691,6 +1686,8 @@ static Property gem_properties[] = { num_type2_screeners, 4), DEFINE_PROP_UINT16("jumbo-max-len", CadenceGEMState, jumbo_max_len, 10240), + DEFINE_PROP_LINK("dma", CadenceGEMState, dma_mr, + TYPE_MEMORY_REGION, MemoryRegion *), DEFINE_PROP_END_OF_LIST(), };
Declare link statically using DEFINE_PROP_LINK(). Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/net/cadence_gem.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)