| Message ID | 20170717023824.18796-7-famz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 07/16/2017 11:38 PM, Fam Zheng wrote: > Signed-off-by: Fam Zheng <famz@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/dma/xilinx_axidma.c | 16 ++++------------ > 1 file changed, 4 insertions(+), 12 deletions(-) > > diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c > index 3987b5f..9b48103 100644 > --- a/hw/dma/xilinx_axidma.c > +++ b/hw/dma/xilinx_axidma.c > @@ -562,18 +562,6 @@ static void xilinx_axidma_init(Object *obj) > XilinxAXIDMA *s = XILINX_AXI_DMA(obj); > SysBusDevice *sbd = SYS_BUS_DEVICE(obj); > > - object_property_add_link(obj, "axistream-connected", TYPE_STREAM_SLAVE, > - (Object **)&s->tx_data_dev, > - qdev_prop_allow_set_link_before_realize, > - OBJ_PROP_LINK_UNREF_ON_RELEASE, > - &error_abort); > - object_property_add_link(obj, "axistream-control-connected", > - TYPE_STREAM_SLAVE, > - (Object **)&s->tx_control_dev, > - qdev_prop_allow_set_link_before_realize, > - OBJ_PROP_LINK_UNREF_ON_RELEASE, > - &error_abort); > - > object_initialize(&s->rx_data_dev, sizeof(s->rx_data_dev), > TYPE_XILINX_AXI_DMA_DATA_STREAM); > object_initialize(&s->rx_control_dev, sizeof(s->rx_control_dev), > @@ -593,6 +581,10 @@ static void xilinx_axidma_init(Object *obj) > > static Property axidma_properties[] = { > DEFINE_PROP_UINT32("freqhz", XilinxAXIDMA, freqhz, 50000000), > + DEFINE_PROP_LINK("axistream-connected", XilinxAXIDMA, > + tx_data_dev, TYPE_STREAM_SLAVE, StreamSlave *), > + DEFINE_PROP_LINK("axistream-control-connected", XilinxAXIDMA, > + tx_control_dev, TYPE_STREAM_SLAVE, StreamSlave *), > DEFINE_PROP_END_OF_LIST(), > }; > >
diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index 3987b5f..9b48103 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -562,18 +562,6 @@ static void xilinx_axidma_init(Object *obj) XilinxAXIDMA *s = XILINX_AXI_DMA(obj); SysBusDevice *sbd = SYS_BUS_DEVICE(obj); - object_property_add_link(obj, "axistream-connected", TYPE_STREAM_SLAVE, - (Object **)&s->tx_data_dev, - qdev_prop_allow_set_link_before_realize, - OBJ_PROP_LINK_UNREF_ON_RELEASE, - &error_abort); - object_property_add_link(obj, "axistream-control-connected", - TYPE_STREAM_SLAVE, - (Object **)&s->tx_control_dev, - qdev_prop_allow_set_link_before_realize, - OBJ_PROP_LINK_UNREF_ON_RELEASE, - &error_abort); - object_initialize(&s->rx_data_dev, sizeof(s->rx_data_dev), TYPE_XILINX_AXI_DMA_DATA_STREAM); object_initialize(&s->rx_control_dev, sizeof(s->rx_control_dev), @@ -593,6 +581,10 @@ static void xilinx_axidma_init(Object *obj) static Property axidma_properties[] = { DEFINE_PROP_UINT32("freqhz", XilinxAXIDMA, freqhz, 50000000), + DEFINE_PROP_LINK("axistream-connected", XilinxAXIDMA, + tx_data_dev, TYPE_STREAM_SLAVE, StreamSlave *), + DEFINE_PROP_LINK("axistream-control-connected", XilinxAXIDMA, + tx_control_dev, TYPE_STREAM_SLAVE, StreamSlave *), DEFINE_PROP_END_OF_LIST(), };
Signed-off-by: Fam Zheng <famz@redhat.com> --- hw/dma/xilinx_axidma.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)