ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

etraxfs_eth: Don't use hw_error() in init() method 

Device init() methods aren't supposed to call hw_error(), they should
report the error and fail cleanly.  Do that.

Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-Id: <1450370121-5768-5-git-send-email-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2015-12-17 17:35:12 +01:00
parent b097e48121
commit 5a8de107e3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/net/etraxfs_eth.c
View File

@ -26,6 +26,7 @@
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "net/net.h" #include "net/net.h"
#include "hw/cris/etraxfs.h" #include "hw/cris/etraxfs.h"
#include "qemu/error-report.h"
#define D(x) #define D(x)
@ -589,7 +590,8 @@ static int fs_eth_init(SysBusDevice *sbd)
ETRAXFSEthState *s = ETRAX_FS_ETH(dev); ETRAXFSEthState *s = ETRAX_FS_ETH(dev);
if (!s->dma_out || !s->dma_in) { if (!s->dma_out || !s->dma_in) {
hw_error("Unconnected ETRAX-FS Ethernet MAC.\n"); error_report("Unconnected ETRAX-FS Ethernet MAC");
return -1;
} }
s->dma_out->client.push = eth_tx_push; s->dma_out->client.push = eth_tx_push;