Patchwork [2/5] xilinx_axienet.c: Assert no error when making link

login
register
mail settings
Submitter Stefan Hajnoczi
Date Feb. 21, 2013, 9:50 a.m.
Message ID <1361440233-8672-3-git-send-email-stefanha@redhat.com>
Download mbox | patch
Permalink /patch/222224/
State New
Headers show

Comments

Stefan Hajnoczi - Feb. 21, 2013, 9:50 a.m.
From: Peter Crosthwaite <peter.crosthwaite@xilinx.com>

This gives an awful silent failure when it doesn't work. Assert against link
creation failure.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/xilinx_axienet.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Patch

diff --git a/hw/xilinx_axienet.c b/hw/xilinx_axienet.c
index 34e344c..e5d9251 100644
--- a/hw/xilinx_axienet.c
+++ b/hw/xilinx_axienet.c
@@ -869,9 +869,11 @@  static int xilinx_enet_init(SysBusDevice *dev)
 static void xilinx_enet_initfn(Object *obj)
 {
     struct XilinxAXIEnet *s = FROM_SYSBUS(typeof(*s), SYS_BUS_DEVICE(obj));
+    Error *errp = NULL;
 
     object_property_add_link(obj, "axistream-connected", TYPE_STREAM_SLAVE,
-                             (Object **) &s->tx_dev, NULL);
+                             (Object **) &s->tx_dev, &errp);
+    assert_no_error(errp);
 }
 
 static Property xilinx_enet_properties[] = {