From patchwork Thu Oct 18 13:11:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 192315 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B5C462C0087 for ; Fri, 19 Oct 2012 00:12:20 +1100 (EST) Received: from localhost ([::1]:35617 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOpta-0006q7-Nm for incoming@patchwork.ozlabs.org; Thu, 18 Oct 2012 09:12:18 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOptH-0006lG-5Y for qemu-devel@nongnu.org; Thu, 18 Oct 2012 09:12:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOptB-0002KG-HY for qemu-devel@nongnu.org; Thu, 18 Oct 2012 09:11:59 -0400 Received: from 38.0.169.217.in-addr.arpa ([217.169.0.38]:38001 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOptB-0002Gw-Bf for qemu-devel@nongnu.org; Thu, 18 Oct 2012 09:11:53 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1TOpt0-0006El-LY; Thu, 18 Oct 2012 14:11:42 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2012 14:11:40 +0100 Message-Id: <1350565902-23940-7-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1350565902-23940-1-git-send-email-peter.maydell@linaro.org> References: <1350565902-23940-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 217.169.0.38 Cc: Blue Swirl , patches@linaro.org Subject: [Qemu-devel] [PATCH v2 6/8] hw/pl011: Use LOG_UNIMP and LOG_GUEST_ERROR X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Use the new LOG_UNIMP and LOG_GUEST_ERROR logging types rather than hw_error(). Signed-off-by: Peter Maydell --- hw/pl011.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/pl011.c b/hw/pl011.c index 3245702..fb22736 100644 --- a/hw/pl011.c +++ b/hw/pl011.c @@ -107,7 +107,8 @@ static uint64_t pl011_read(void *opaque, target_phys_addr_t offset, case 18: /* UARTDMACR */ return s->dmacr; default: - hw_error("pl011_read: Bad offset %x\n", (int)offset); + qemu_log_mask(LOG_GUEST_ERROR, + "pl011_read: Bad offset %x\n", (int)offset); return 0; } } @@ -178,11 +179,13 @@ static void pl011_write(void *opaque, target_phys_addr_t offset, break; case 18: /* UARTDMACR */ s->dmacr = value; - if (value & 3) - hw_error("PL011: DMA not implemented\n"); + if (value & 3) { + qemu_log_mask(LOG_UNIMP, "pl011: DMA not implemented\n"); + } break; default: - hw_error("pl011_write: Bad offset %x\n", (int)offset); + qemu_log_mask(LOG_GUEST_ERROR, + "pl011_write: Bad offset %x\n", (int)offset); } }