From patchwork Sun Oct 14 13:11:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 12213 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 4CF9C23F9C for ; Sun, 14 Oct 2012 13:11:23 +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 0109AA18C73 for ; Sun, 14 Oct 2012 13:11:22 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so6506599iej.11 for ; Sun, 14 Oct 2012 06:11:22 -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=hdEsQTvOvAYFjWD39aiY6YqnojEBwaRb+HSIa3GgVkQ=; b=LUOHWyOJ1bAkQZ8shNTx9XS2iQxVt3o+g6qqd+ES/BUappTSSXEl78Dwmlt6AfMwoU odDZzwzbIITXJ7hHTjaqB7grPE+zKsvtrEwhEKiMF/V06VSjri9kuGuXk19I+rt3pPZS ccEd7QXpIleqgb2X42GY6MObtyCzMt5M6tqwM+qlg1EXCVtluXQZIWfs6ac9faTacm9f pzLtNAhAUoYfCoKFnMNPlw0+wKXPihWKHgk/p4zlTQJK3e96uO2QjIrLuPeDW4q5skuw +Hp1iNnoPy6BR2KD3B9F23kCOzgZX94KdX7/r6fHkc7ZMf0ugp0W3Roo9W8tk8iVLT63 aCtw== Received: by 10.50.87.134 with SMTP id ay6mr6312650igb.70.1350220282470; Sun, 14 Oct 2012 06:11:22 -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 n20csp450962igt; Sun, 14 Oct 2012 06:11:20 -0700 (PDT) Received: by 10.180.100.35 with SMTP id ev3mr17413757wib.7.1350220279584; Sun, 14 Oct 2012 06:11:19 -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 g8si6880050wie.19.2012.10.14.06.11.18 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 14 Oct 2012 06:11:19 -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 1TNNyO-0004GI-9y; Sun, 14 Oct 2012 14:11:16 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Blue Swirl Subject: [PATCH 5/7] hw/pl011: Use LOG_UNIMP and LOG_GUEST_ERROR Date: Sun, 14 Oct 2012 14:11:14 +0100 Message-Id: <1350220276-16349-6-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1350220276-16349-1-git-send-email-peter.maydell@linaro.org> References: <1350220276-16349-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQmi7XaPkj4V/nOGFPwUGtnCCVS6l/lAnGZUHw0rUcOpQrV6wrgiCJ7W4fKG3vb3aKiwh3L6 Use the new LOG_UNIMP and LOG_GUEST_ERROR logging types rather than hw_error(). Signed-off-by: Peter Maydell --- hw/pl011.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/pl011.c b/hw/pl011.c index 3245702..743eea6 100644 --- a/hw/pl011.c +++ b/hw/pl011.c @@ -9,6 +9,7 @@ #include "sysbus.h" #include "qemu-char.h" +#include "qemu-log.h" typedef struct { SysBusDevice busdev; @@ -107,7 +108,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 +180,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); } }