From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: Peter Maydell <peter.maydell@linaro.org>, Thomas Huth <thuth@redhat.com>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
qemu-devel@nongnu.org, qemu-trivial@nongnu.org,
qemu-arm@nongnu.org, "Jason Wang" <jasowang@redhat.com>
Subject: [Qemu-devel] [PATCH v3 13/16] hw/net/smc91c111: Use qemu_log_mask(GUEST_ERROR) instead of hw_error
Date: Sun, 24 Jun 2018 01:06:06 -0300 [thread overview]
Message-ID: <20180624040609.17572-14-f4bug@amsat.org> (raw)
In-Reply-To: <20180624040609.17572-1-f4bug@amsat.org>
hw_error() finally calls abort(), but there is no need to abort here.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/net/smc91c111.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
index c8cc5379b7..9094c0b47c 100644
--- a/hw/net/smc91c111.c
+++ b/hw/net/smc91c111.c
@@ -11,6 +11,7 @@
#include "hw/sysbus.h"
#include "net/net.h"
#include "hw/devices.h"
+#include "qemu/log.h"
/* For crc32 */
#include <zlib.h>
@@ -478,7 +479,9 @@ static void smc91c111_writeb(void *opaque, hwaddr offset,
}
break;
}
- hw_error("smc91c111_write: Bad reg %d:%x\n", s->bank, (int)offset);
+ qemu_log_mask(LOG_GUEST_ERROR, "smc91c111_write(bank:%d) Illegal register"
+ " 0x%" HWADDR_PRIx " = 0x%x\n",
+ s->bank, offset, value);
}
static uint32_t smc91c111_readb(void *opaque, hwaddr offset)
@@ -621,7 +624,9 @@ static uint32_t smc91c111_readb(void *opaque, hwaddr offset)
}
break;
}
- hw_error("smc91c111_read: Bad reg %d:%x\n", s->bank, (int)offset);
+ qemu_log_mask(LOG_GUEST_ERROR, "smc91c111_read(bank:%d) Illegal register"
+ " 0x%" HWADDR_PRIx "\n",
+ s->bank, offset);
return 0;
}
--
2.18.0
next prev parent reply other threads:[~2018-06-24 4:07 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-24 4:05 [Qemu-devel] [PATCH v3 00/16] hw/arm: use qemu_log_mask instead of fprintf Philippe Mathieu-Daudé
2018-06-24 4:05 ` [Qemu-devel] [PATCH v3 01/16] hw/input/pckbd: Use qemu_log_mask(GUEST_ERROR) " Philippe Mathieu-Daudé
2018-06-25 11:55 ` Thomas Huth
2018-06-24 4:05 ` [Qemu-devel] [PATCH v3 02/16] hw/input/tsc2005: " Philippe Mathieu-Daudé
2018-06-24 4:05 ` [Qemu-devel] [PATCH v3 03/16] hw/dma/omap_dma: Use qemu_log_mask(UNIMP) instead of printf Philippe Mathieu-Daudé
2018-06-24 4:05 ` [Qemu-devel] [PATCH v3 04/16] hw/dma/omap_dma: Use qemu_log_mask(GUEST_ERROR) instead of fprintf Philippe Mathieu-Daudé
2018-06-24 4:05 ` [Qemu-devel] [PATCH v3 05/16] hw/ssi/omap_spi: " Philippe Mathieu-Daudé
2018-06-24 4:05 ` [Qemu-devel] [PATCH v3 06/16] hw/sd/omap_mmc: Use qemu_log_mask(UNIMP) instead of printf Philippe Mathieu-Daudé
2018-06-24 4:06 ` [Qemu-devel] [PATCH v3 07/16] hw/i2c/omap_i2c: Use qemu_log_mask(UNIMP) instead of fprintf Philippe Mathieu-Daudé
2018-06-24 4:06 ` [Qemu-devel] [PATCH v3 08/16] hw/arm/omap1: Use qemu_log_mask(GUEST_ERROR) " Philippe Mathieu-Daudé
2018-06-24 4:06 ` [Qemu-devel] [PATCH v3 09/16] hw/arm/omap: " Philippe Mathieu-Daudé
2018-06-25 12:05 ` Thomas Huth
2018-06-24 4:06 ` [Qemu-devel] [PATCH v3 10/16] hw/arm/stellaris: Use qemu_log_mask(UNIMP) " Philippe Mathieu-Daudé
2018-06-24 4:06 ` [Qemu-devel] [PATCH v3 11/16] hw/net/stellaris_enet: Fix a typo Philippe Mathieu-Daudé
2018-06-24 4:06 ` [Qemu-devel] [PATCH v3 12/16] hw/net/stellaris_enet: Use qemu_log_mask(GUEST_ERROR) instead of hw_error Philippe Mathieu-Daudé
2018-06-24 4:06 ` Philippe Mathieu-Daudé [this message]
2018-06-24 4:06 ` [Qemu-devel] [PATCH v3 14/16] hw/net/smc91c111: Use qemu_log_mask(UNIMP) instead of fprintf Philippe Mathieu-Daudé
2018-06-24 4:06 ` [Qemu-devel] [PATCH v3 15/16] hw/arm/stellaris: Fix gptm_write() error message Philippe Mathieu-Daudé
2018-06-24 4:06 ` [Qemu-devel] [PATCH v3 16/16] hw/arm/stellaris: Use HWADDR_PRIx to display register address Philippe Mathieu-Daudé
2018-06-26 15:51 ` [Qemu-devel] [PATCH v3 00/16] hw/arm: use qemu_log_mask instead of fprintf Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180624040609.17572-14-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=jasowang@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).