[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v3 12/16] hw/net/stellaris_enet: Use qemu_log_mask(GUE
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-arm] [PATCH v3 12/16] hw/net/stellaris_enet: Use qemu_log_mask(GUEST_ERROR) instead of hw_error |
Date: |
Sun, 24 Jun 2018 01:06:05 -0300 |
hw_error() finally calls abort(), but there is no need to abort here.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/net/stellaris_enet.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c
index 1e7329517c..165562d788 100644
--- a/hw/net/stellaris_enet.c
+++ b/hw/net/stellaris_enet.c
@@ -9,6 +9,7 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "net/net.h"
+#include "qemu/log.h"
#include <zlib.h>
//#define DEBUG_STELLARIS_ENET 1
@@ -343,7 +344,9 @@ static uint64_t stellaris_enet_read(void *opaque, hwaddr
offset,
case 0x3c: /* Undocumented: Timestamp? */
return 0;
default:
- hw_error("stellaris_enet_read: Bad offset %x\n", (int)offset);
+ qemu_log_mask(LOG_GUEST_ERROR, "stellaris_enet_rd%d: Illegal register"
+ " 0x02%" HWADDR_PRIx "\n",
+ size * 8, offset);
return 0;
}
}
@@ -442,7 +445,9 @@ static void stellaris_enet_write(void *opaque, hwaddr
offset,
/* Ignored. */
break;
default:
- hw_error("stellaris_enet_write: Bad offset %x\n", (int)offset);
+ qemu_log_mask(LOG_GUEST_ERROR, "stellaris_enet_wr%d: Illegal register "
+ "0x02%" HWADDR_PRIx " = 0x%" PRIx64
"\n",
+ size * 8, offset, value);
}
}
--
2.18.0
- [Qemu-arm] [PATCH v3 03/16] hw/dma/omap_dma: Use qemu_log_mask(UNIMP) instead of printf, (continued)
- [Qemu-arm] [PATCH v3 03/16] hw/dma/omap_dma: Use qemu_log_mask(UNIMP) instead of printf, Philippe Mathieu-Daudé, 2018/06/24
- [Qemu-arm] [PATCH v3 05/16] hw/ssi/omap_spi: Use qemu_log_mask(GUEST_ERROR) instead of fprintf, Philippe Mathieu-Daudé, 2018/06/24
- [Qemu-arm] [PATCH v3 06/16] hw/sd/omap_mmc: Use qemu_log_mask(UNIMP) instead of printf, Philippe Mathieu-Daudé, 2018/06/24
- [Qemu-arm] [PATCH v3 07/16] hw/i2c/omap_i2c: Use qemu_log_mask(UNIMP) instead of fprintf, Philippe Mathieu-Daudé, 2018/06/24
- [Qemu-arm] [PATCH v3 04/16] hw/dma/omap_dma: Use qemu_log_mask(GUEST_ERROR) instead of fprintf, Philippe Mathieu-Daudé, 2018/06/24
- [Qemu-arm] [PATCH v3 09/16] hw/arm/omap: Use qemu_log_mask(GUEST_ERROR) instead of fprintf, Philippe Mathieu-Daudé, 2018/06/24
- [Qemu-arm] [PATCH v3 10/16] hw/arm/stellaris: Use qemu_log_mask(UNIMP) instead of fprintf, Philippe Mathieu-Daudé, 2018/06/24
- [Qemu-arm] [PATCH v3 11/16] hw/net/stellaris_enet: Fix a typo, Philippe Mathieu-Daudé, 2018/06/24
- [Qemu-arm] [PATCH v3 08/16] hw/arm/omap1: Use qemu_log_mask(GUEST_ERROR) instead of fprintf, Philippe Mathieu-Daudé, 2018/06/24
- [Qemu-arm] [PATCH v3 12/16] hw/net/stellaris_enet: Use qemu_log_mask(GUEST_ERROR) instead of hw_error,
Philippe Mathieu-Daudé <=
- [Qemu-arm] [PATCH v3 13/16] hw/net/smc91c111: Use qemu_log_mask(GUEST_ERROR) instead of hw_error, Philippe Mathieu-Daudé, 2018/06/24
- [Qemu-arm] [PATCH v3 14/16] hw/net/smc91c111: Use qemu_log_mask(UNIMP) instead of fprintf, Philippe Mathieu-Daudé, 2018/06/24
- [Qemu-arm] [PATCH v3 15/16] hw/arm/stellaris: Fix gptm_write() error message, Philippe Mathieu-Daudé, 2018/06/24
- [Qemu-arm] [PATCH v3 16/16] hw/arm/stellaris: Use HWADDR_PRIx to display register address, Philippe Mathieu-Daudé, 2018/06/24
- Re: [Qemu-arm] [PATCH v3 00/16] hw/arm: use qemu_log_mask instead of fprintf, Peter Maydell, 2018/06/26