[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-trivial] [PATCH v2 11/14] hw/net/stellaris_enet: Use qemu_log_
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-trivial] [PATCH v2 11/14] hw/net/stellaris_enet: Use qemu_log_mask(GUEST_ERROR) instead of hw_error |
Date: |
Fri, 22 Jun 2018 17:15:51 -0300 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 |
On 06/22/2018 04:50 PM, Thomas Huth wrote:
> 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).
Well I guess it depends the maintainer taking it :)
Since I expect this series to go via the ARM tree, I'll fix this typo in
another patch.
>
>> 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?
Oops "* 8" indeed.
>
>> 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-trivial] [PATCH v2 07/14] hw/i2c/omap_i2c: Use qemu_log_mask(UNIMP) instead of fprintf, (continued)
[Qemu-trivial] [PATCH v2 08/14] hw/arm/omap1: Use qemu_log_mask(GUEST_ERROR) instead of fprintf, Philippe Mathieu-Daudé, 2018/06/22
[Qemu-trivial] [PATCH v2 10/14] hw/arm/stellaris: Use qemu_log_mask(UNIMP) instead of fprintf, Philippe Mathieu-Daudé, 2018/06/22
[Qemu-trivial] [PATCH v2 12/14] hw/net/smc91c111: Use qemu_log_mask(GUEST_ERROR) instead of hw_error, Philippe Mathieu-Daudé, 2018/06/22
[Qemu-trivial] [PATCH v2 11/14] hw/net/stellaris_enet: Use qemu_log_mask(GUEST_ERROR) instead of hw_error, Philippe Mathieu-Daudé, 2018/06/22
[Qemu-trivial] [PATCH v2 13/14] hw/net/smc91c111: Use qemu_log_mask(UNIMP) instead of fprintf, Philippe Mathieu-Daudé, 2018/06/22
[Qemu-trivial] [PATCH v2 14/14] hw/arm/stellaris: Fix gptm_write() error message, Philippe Mathieu-Daudé, 2018/06/22
Message not available
Message not available