From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39308) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9XXP-0003QQ-JI for qemu-devel@nongnu.org; Thu, 17 Dec 2015 07:20:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9XXL-0002iP-3Y for qemu-devel@nongnu.org; Thu, 17 Dec 2015 07:20:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35563) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9XXK-0002i8-UY for qemu-devel@nongnu.org; Thu, 17 Dec 2015 07:19:59 -0500 From: Markus Armbruster Date: Thu, 17 Dec 2015 13:19:46 +0100 Message-Id: <1450354795-31608-5-git-send-email-armbru@redhat.com> In-Reply-To: <1450354795-31608-1-git-send-email-armbru@redhat.com> References: <1450354795-31608-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 04/13] etraxfs_eth: Don't use hw_error() in init() method List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , Markus Armbruster 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 --- 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.4.3