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: 12334 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 8416423DE2 for ; Thu, 18 Oct 2012 13:11:49 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 2738BA18611 for ; Thu, 18 Oct 2012 13:11:49 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so13185440iej.11 for ; Thu, 18 Oct 2012 06:11:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=Ihjlde8hW/o4Xmg1+nRfp3QZI0OA+90oRwsaYPOSrHI=; b=KGw7PQiQk+9k01SSEzyiNiVuMAv4rysz4S3NYIv5TblgpQUVdtwTxuuQ+vfMaWPxp0 veXoTMiIsL74tykBPdJAUwauWAjKfTre8hEEz72DOLAEg5qr+7SnewKDhxY16+mk/njw lmKiPHaLJv/4ZCGumuQ9LTrUQkeZoYokgEo7S9ENn+SahSNl9nBpNu5fvjfaWN4o0JWv 0EfmH7ZGihjrchePicRtNB2SJWKE5VPjq98Ik8gFaZYovmm92MiJOsPjUhhmfvwndjfK 94WYnuKUlFLLuAY+baBMvj+0SJmLW9bzAsn+PDZ8ZVFRN10xGPzHefGbkARA49voKYiB htew== Received: by 10.50.152.137 with SMTP id uy9mr4584551igb.62.1350565908557; Thu, 18 Oct 2012 06:11:48 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp1069413igt; Thu, 18 Oct 2012 06:11:46 -0700 (PDT) Received: by 10.180.83.234 with SMTP id t10mr11313452wiy.7.1350565905400; Thu, 18 Oct 2012 06:11:45 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id r10si31618455wic.5.2012.10.18.06.11.44 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Oct 2012 06:11:45 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Authentication-Results: mx.google.com; spf=neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) smtp.mail=pm215@archaic.org.uk 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 Cc: patches@linaro.org, Blue Swirl Subject: [PATCH v2 6/8] hw/pl011: Use LOG_UNIMP and LOG_GUEST_ERROR 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-Gm-Message-State: ALoCoQk7UEY7/oV56X3tHppSkBC7JUKORzBjiTWxUDE8E++LPGglrj47qVgNtTEY7ywYW4h0JwU+ 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); } }