From patchwork Sun Oct 14 13:11:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 12215 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 9D8982418A 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 4AC28A18C8D for ; Sun, 14 Oct 2012 13:11:23 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so6506602iej.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=QqSlfu+kOZAa4qWSc9fMMrajVF3R0dJqT+diLiqDm3M=; b=jsuoZN2D8GLohTIAIrd7Y88jq6MLUQMNdQSX4oGzLui7uohWfqN8qGBlWT5tEkjBT4 Er07Ix6l5bCUnm90zwDy8ZR1yvy/HgHUR9LLBhrDDLzDY7yremeCWOAFVdpB229nqP1B ATg71IgbOOoRfaBXpozf96VS3wRGs6yaTUa/ibfQNNkZHjoNqKptlXjf+vDCZBZJhxRT ijdzFUqdGCBMIeRBRkKv3BZaWIRd6WGCyj6CWuRtbkFaPZvzM0m+Ez/T9pY9EA4L8KGO JkzNt0BhEoQbgdBRhC6gTyWTGjSOSWo7eJF8aAtiIcvy9b1uQeeBn1JdwVPqaWMlzQeW DfPw== Received: by 10.50.161.169 with SMTP id xt9mr4787363igb.62.1350220282786; 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 n20csp450963igt; Sun, 14 Oct 2012 06:11:20 -0700 (PDT) Received: by 10.180.8.41 with SMTP id o9mr17444156wia.3.1350220279495; 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 t9si6886296wiz.23.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-0004GK-BV; Sun, 14 Oct 2012 14:11:16 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Blue Swirl Subject: [PATCH 6/7] hw/pl022: Use LOG_UNIMP and LOG_GUEST_ERROR Date: Sun, 14 Oct 2012 14:11:15 +0100 Message-Id: <1350220276-16349-7-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: ALoCoQmRTw8e9olm/E34ZDEt91TpJqv7XHp4npy4FXe9a9/MI+ZPQcN23qo389Ga4aVKlm4HrFOk Use LOG_UNIMP and LOG_GUEST_ERROR where appropriate rather than hw_error(). Signed-off-by: Peter Maydell --- hw/pl022.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/pl022.c b/hw/pl022.c index 60e35da..91e5df0 100644 --- a/hw/pl022.c +++ b/hw/pl022.c @@ -9,6 +9,7 @@ #include "sysbus.h" #include "ssi.h" +#include "qemu-log.h" //#define DEBUG_PL022 1 @@ -168,7 +169,8 @@ static uint64_t pl022_read(void *opaque, target_phys_addr_t offset, /* Not implemented. */ return 0; default: - hw_error("pl022_read: Bad offset %x\n", (int)offset); + qemu_log_mask(LOG_GUEST_ERROR, + "pl022_read: Bad offset %x\n", (int)offset); return 0; } } @@ -211,11 +213,12 @@ static void pl022_write(void *opaque, target_phys_addr_t offset, break; case 0x20: /* DMACR */ if (value) { - hw_error("pl022: DMA not implemented\n"); + qemu_log_mask(LOG_UNIMP, "pl022: DMA not implemented\n"); } break; default: - hw_error("pl022_write: Bad offset %x\n", (int)offset); + qemu_log_mask(LOG_GUEST_ERROR, + "pl022_write: Bad offset %x\n", (int)offset); } }