Revision 5433a0a8 include/hw/xilinx.h

b/include/hw/xilinx.h
59 59
                        StreamSlave *cs, hwaddr base, qemu_irq irq, int txmem,
60 60
                        int rxmem)
61 61
{
62
    Error *errp = NULL;
63

  
64 62
    qdev_set_nic_properties(dev, nd);
65 63
    qdev_prop_set_uint32(dev, "rxmem", rxmem);
66 64
    qdev_prop_set_uint32(dev, "txmem", txmem);
67 65
    object_property_set_link(OBJECT(dev), OBJECT(ds),
68
                             "axistream-connected", &errp);
66
                             "axistream-connected", &error_abort);
69 67
    object_property_set_link(OBJECT(dev), OBJECT(cs),
70
                             "axistream-control-connected", &errp);
71
    assert_no_error(errp);
68
                             "axistream-control-connected", &error_abort);
72 69
    qdev_init_nofail(dev);
73 70
    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);
74 71
    sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq);
......
78 75
xilinx_axidma_init(DeviceState *dev, StreamSlave *ds, StreamSlave *cs,
79 76
                   hwaddr base, qemu_irq irq, qemu_irq irq2, int freqhz)
80 77
{
81
    Error *errp = NULL;
82

  
83 78
    qdev_prop_set_uint32(dev, "freqhz", freqhz);
84 79
    object_property_set_link(OBJECT(dev), OBJECT(ds),
85
                             "axistream-connected", &errp);
80
                             "axistream-connected", &error_abort);
86 81
    object_property_set_link(OBJECT(dev), OBJECT(cs),
87
                             "axistream-control-connected", &errp);
88
    assert_no_error(errp);
82
                             "axistream-control-connected", &error_abort);
89 83
    qdev_init_nofail(dev);
90 84

  
91 85
    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);

Also available in: Unified diff