[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-arm] [PATCH v2 11/14] hw/net/stellaris_enet: Use qemu_log_mask
From: |
Thomas Huth |
Subject: |
Re: [Qemu-arm] [PATCH v2 11/14] hw/net/stellaris_enet: Use qemu_log_mask(GUEST_ERROR) instead of hw_error |
Date: |
Fri, 22 Jun 2018 21:50:53 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 |
On 22.06.2018 15:40, Philippe Mathieu-Daudé wrote:
> 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 04bd10ada3..f8edebdecd 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: /* Undocuented: Timestamp? */
I guess it's trivial enough that you could fix the above type in your
patch here, too (just mention it in the patch description).
> 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 << 2, offset);
Why "<< 2" ? Shouldn't that be "<< 3" or "* 8" instead?
> 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%lx\n",
> + size << 2, offset, value);
dito.
Thomas
- Re: [Qemu-arm] [PATCH v2 08/14] hw/arm/omap1: Use qemu_log_mask(GUEST_ERROR) instead of fprintf, (continued)
- [Qemu-arm] [PATCH v2 12/14] hw/net/smc91c111: Use qemu_log_mask(GUEST_ERROR) instead of hw_error, Philippe Mathieu-Daudé, 2018/06/22
- [Qemu-arm] [PATCH v2 11/14] hw/net/stellaris_enet: Use qemu_log_mask(GUEST_ERROR) instead of hw_error, Philippe Mathieu-Daudé, 2018/06/22
- Re: [Qemu-arm] [PATCH v2 11/14] hw/net/stellaris_enet: Use qemu_log_mask(GUEST_ERROR) instead of hw_error,
Thomas Huth <=
- [Qemu-arm] [PATCH v2 13/14] hw/net/smc91c111: Use qemu_log_mask(UNIMP) instead of fprintf, Philippe Mathieu-Daudé, 2018/06/22
- [Qemu-arm] [PATCH v2 14/14] hw/arm/stellaris: Fix gptm_write() error message, Philippe Mathieu-Daudé, 2018/06/22
- Message not available