diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-12-17 17:35:12 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2016-01-13 11:58:58 +0100 |
| commit | 5a8de107e3496855147e823de32ff70cada725d1 (patch) | |
| tree | d21d8af030e546040dbc7f4da9ca89e64fce4fb3 | |
| parent | b097e481217ac30eeac675ec16711ef360ccce72 (diff) | |
| download | qemu-5a8de107e3496855147e823de32ff70cada725d1.zip qemu-5a8de107e3496855147e823de32ff70cada725d1.tar.gz qemu-5a8de107e3496855147e823de32ff70cada725d1.tar.bz2 | |
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>
| -rw-r--r-- | hw/net/etraxfs_eth.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/net/etraxfs_eth.c b/hw/net/etraxfs_eth.c index d600275..b562ac9 100644 --- a/hw/net/etraxfs_eth.c +++ b/hw/net/etraxfs_eth.c @@ -26,6 +26,7 @@ #include "hw/sysbus.h" #include "net/net.h" #include "hw/cris/etraxfs.h" +#include "qemu/error-report.h" #define D(x) @@ -589,7 +590,8 @@ static int fs_eth_init(SysBusDevice *sbd) ETRAXFSEthState *s = ETRAX_FS_ETH(dev); 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; |