[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/12] etraxfs_eth: Don't use hw_error() in init() m
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 04/12] etraxfs_eth: Don't use hw_error() in init() method |
Date: |
Thu, 10 Dec 2015 11:29:24 +0100 |
Device init() methods aren't supposed to call hw_error(), they should
report the error and fail cleanly. Do that.
Cc: "Edgar E. Iglesias" <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
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
- [Qemu-devel] [PATCH 05/12] raven: Mark use of hw_error() in realize() FIXME, (continued)
- [Qemu-devel] [PATCH 02/12] omap: Don't use hw_error() in device init() methods, Markus Armbruster, 2015/12/10
- [Qemu-devel] [PATCH 04/12] etraxfs_eth: Don't use hw_error() in init() method,
Markus Armbruster <=
- [Qemu-devel] [PATCH 01/12] hw: Don't use hw_error() for machine initialization errors, Markus Armbruster, 2015/12/10
- [Qemu-devel] [PATCH 03/12] arm_mptimer: Don't use hw_error() in realize() method, Markus Armbruster, 2015/12/10
- [Qemu-devel] [PATCH 06/12] hw/arm/virt: Fix property "gic-version" error handling, Markus Armbruster, 2015/12/10