From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9ceJ-0001US-7I for qemu-devel@nongnu.org; Thu, 17 Dec 2015 12:47:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9ceH-0006uu-EZ for qemu-devel@nongnu.org; Thu, 17 Dec 2015 12:47:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43999) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9ceH-0006uq-8j for qemu-devel@nongnu.org; Thu, 17 Dec 2015 12:47:29 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id DC40EA4525 for ; Thu, 17 Dec 2015 17:47:28 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-112-23.ams2.redhat.com [10.36.112.23]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tBHHkfcP014618 for ; Thu, 17 Dec 2015 12:47:28 -0500 From: Paolo Bonzini Date: Thu, 17 Dec 2015 18:46:19 +0100 Message-Id: <1450374401-31352-24-git-send-email-pbonzini@redhat.com> In-Reply-To: <1450374401-31352-1-git-send-email-pbonzini@redhat.com> References: <1450374401-31352-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 23/45] cris: avoid "naked" qemu_log List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Reviewed-by: Edgar E. Iglesias Signed-off-by: Paolo Bonzini --- 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