On Mon, Jan 22, 2018 at 7:58 PM, Philippe Mathieu-Daudé <f4...@amsat.org> wrote:
> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Reviewed-by: Alistair Francis <alistair.fran...@xilinx.com>
Alistair
> ---
> hw/sd/milkymist-memcard.c | 17 ++++++++++-------
> 1 file changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c
> index 341da88552..1292c0c099 100644
> --- a/hw/sd/milkymist-memcard.c
> +++ b/hw/sd/milkymist-memcard.c
> @@ -22,11 +22,12 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/log.h"
> #include "hw/hw.h"
> #include "hw/sysbus.h"
> #include "sysemu/sysemu.h"
> #include "trace.h"
> -#include "qemu/error-report.h"
> +#include "include/qapi/error.h"
> #include "sysemu/block-backend.h"
> #include "sysemu/blockdev.h"
> #include "hw/sd/sd.h"
> @@ -138,8 +139,8 @@ static uint64_t memcard_read(void *opaque, hwaddr addr,
> } else {
> r = s->response[s->response_read_ptr++];
> if (s->response_read_ptr > s->response_len) {
> - error_report("milkymist_memcard: "
> - "read more cmd bytes than available. Clipping.");
> + qemu_log_mask(LOG_GUEST_ERROR, "milkymist_memcard: "
> + "read more cmd bytes than available.
> Clipping.");
> s->response_read_ptr = 0;
> }
> }
> @@ -163,8 +164,9 @@ static uint64_t memcard_read(void *opaque, hwaddr addr,
> break;
>
> default:
> - error_report("milkymist_memcard: read access to unknown register 0x"
> - TARGET_FMT_plx, addr << 2);
> + qemu_log_mask(LOG_UNIMP, "milkymist_memcard: "
> + "read access to unknown register 0x%" HWADDR_PRIx "\n",
> + addr << 2);
> break;
> }
>
> @@ -220,8 +222,9 @@ static void memcard_write(void *opaque, hwaddr addr,
> uint64_t value,
> break;
>
> default:
> - error_report("milkymist_memcard: write access to unknown register 0x"
> - TARGET_FMT_plx, addr << 2);
> + qemu_log_mask(LOG_UNIMP, "milkymist_memcard: "
> + "write access to unknown register 0x%" HWADDR_PRIx " "
> + "(value 0x%" PRIx64 ")\n", addr << 2, value);
> break;
> }
> }
> --
> 2.15.1
>
>
