Re: [Qemu-devel] [PATCH 03/11] cris: avoid "naked" qemu_log

[Edgar E. Iglesias]

On Sat, Dec 12, 2015 at 11:36:19AM +0100, Paolo Bonzini wrote:
> Cc: Edgar E. Iglesias <address@hidden>
> Signed-off-by: Paolo Bonzini <address@hidden>

Reviewed-by: Edgar E. Iglesias <address@hidden>


> ---
>  hw/char/etraxfs_ser.c       | 2 +-
>  target-cris/helper.h        | 1 -
>  target-cris/op_helper.c     | 5 -----
>  target-cris/translate.c     | 2 +-
>  target-cris/translate_v10.c | 2 +-
>  5 files changed, 3 insertions(+), 9 deletions(-)
> 
> diff --git a/hw/char/etraxfs_ser.c b/hw/char/etraxfs_ser.c
> index 562021e..d4d875e 100644
> --- a/hw/char/etraxfs_ser.c
> +++ b/hw/char/etraxfs_ser.c
> @@ -165,7 +165,7 @@ static void serial_receive(void *opaque, const uint8_t 
> *buf, int size)
>  
>      /* Got a byte.  */
>      if (s->rx_fifo_len >= 16) {
> -        qemu_log("WARNING: UART dropped char.\n");
> +        D(qemu_log("WARNING: UART dropped char.\n"));
>          return;
>      }
>  
> diff --git a/target-cris/helper.h b/target-cris/helper.h
> index 0b383b2..ff35956 100644
> --- a/target-cris/helper.h
> +++ b/target-cris/helper.h
> @@ -1,7 +1,6 @@
>  DEF_HELPER_2(raise_exception, void, env, i32)
>  DEF_HELPER_2(tlb_flush_pid, void, env, i32)
>  DEF_HELPER_2(spc_write, void, env, i32)
> -DEF_HELPER_3(dump, void, i32, i32, i32)
>  DEF_HELPER_1(rfe, void, env)
>  DEF_HELPER_1(rfn, void, env)
>  
> diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c
> index 5c0c14d..2296677 100644
> --- a/target-cris/op_helper.c
> +++ b/target-cris/op_helper.c
> @@ -91,11 +91,6 @@ void helper_spc_write(CPUCRISState *env, uint32_t new_spc)
>  #endif
>  }
>  
> -void helper_dump(uint32_t a0, uint32_t a1, uint32_t a2)
> -{
> -     qemu_log("%s: a0=%x a1=%x\n", __func__, a0, a1);
> -}
> -
>  /* Used by the tlb decoder.  */
>  #define EXTRACT_FIELD(src, start, end) \
>           (((src) >> start) & ((1 << (end - start + 1)) - 1))
> diff --git a/target-cris/translate.c b/target-cris/translate.c
> index 354c86d..2429931 100644
> --- a/target-cris/translate.c
> +++ b/target-cris/translate.c
> @@ -779,7 +779,7 @@ static void cris_alu_op_exec(DisasContext *dc, int op,
>          t_gen_subx_carry(dc, dst);
>          break;
>      default:
> -        qemu_log("illegal ALU op.\n");
> +        qemu_log_mask(LOG_GUEST_ERROR, "illegal ALU op.\n");
>          BUG();
>          break;
>      }
> diff --git a/target-cris/translate_v10.c b/target-cris/translate_v10.c
> index 3ab1c39..df20bdc 100644
> --- a/target-cris/translate_v10.c
> +++ b/target-cris/translate_v10.c
> @@ -58,7 +58,7 @@ static inline int dec10_size(unsigned int size)
>  
>  static inline void cris_illegal_insn(DisasContext *dc)
>  {
> -    qemu_log("illegal insn at pc=%x\n", dc->pc);
> +    qemu_log_mask(LOG_GUEST_ERROR, "illegal insn at pc=%x\n", dc->pc);
>      t_gen_raise_exception(EXCP_BREAK);
>  }
>  
> -- 
> 2.5.0
> 
> 
>