Commit 39d3d808 authored by Fam Zheng's avatar Fam Zheng Committed by Peter Maydell
Browse files

xilinx_axidma: Convert to DEFINE_PROP_LINK 



Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20170905131149.10669-7-famz@redhat.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 26cfb11f

hw/dma/xilinx_axidma.c

+4 −12
Original line number Diff line number Diff line
@@ -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(),

};