From 5a8de107e3496855147e823de32ff70cada725d1 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 17 Dec 2015 17:35:12 +0100 Subject: [PATCH] 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" Signed-off-by: Markus Armbruster Reviewed-by: Edgar E. Iglesias Message-Id: <1450370121-5768-5-git-send-email-armbru@redhat.com> --- hw/net/etraxfs_eth.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; -- 2.7.4