From patchwork Thu Oct 25 12:57:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 12515 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 5A0A623EFB for ; Thu, 25 Oct 2012 12:57:55 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 0ACE0A18FEB for ; Thu, 25 Oct 2012 12:57:54 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id f6so1219553iag.11 for ; Thu, 25 Oct 2012 05:57:54 -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=a6Wc+aLhQl4otjfxDwwW26PCd90DlfnXAWoqOkfAEJA=; b=T9upRi6LX6OaMBBiSERle5g46sNyAvolo3Lh77KOHERVQscr/3iX+l5MdqAos8+8On adLIVEJ1RuzVSU5vtszGMTPI6/5jbabOQ7aAva2o+SOhAU15n12/iU6R1lS2kakb2gxh yULiqg0ar3ZNxOm6Oq8yKzYuLkVUvZmQIb4gzjaYbRtSz7SkXa8fz1sVZaJBPZFUJANQ za7gD5M5Kq8Ex+XkZHFuDt5kFhJaoRW2dTKc07PqoUZN6/23CiRUIYaWZWbtPQmVUEOq HnSlqrImUC+qs5r6LCGompglkBQQimE5iq1Mu3pvG86zeL1qSD4sEAyAS6ZFWOpLpg5u K4Zw== Received: by 10.42.57.10 with SMTP id b10mr16611214ich.54.1351169874692; Thu, 25 Oct 2012 05:57:54 -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 n20csp42932igt; Thu, 25 Oct 2012 05:57:52 -0700 (PDT) Received: by 10.68.222.37 with SMTP id qj5mr58890811pbc.132.1351169872444; Thu, 25 Oct 2012 05:57:52 -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 h9si25242088paw.134.2012.10.25.05.57.51 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 25 Oct 2012 05:57:52 -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 1TRN0N-0001Qh-II; Thu, 25 Oct 2012 13:57:47 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH 03/12] hw/pl080: Use LOG_GUEST_ERROR and LOG_UNIMP Date: Thu, 25 Oct 2012 13:57:38 +0100 Message-Id: <1351169867-5466-4-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1351169867-5466-1-git-send-email-peter.maydell@linaro.org> References: <1351169867-5466-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQkm0CrvtlutBrHd+roAODHWq0aD+HZcc7oeaC0mX7q+C29A8txPFqySmHXv0NrP1A2F2Dw7 Use LOG_GUEST_ERROR and LOG_UNIMP in preference to hw_error(). Signed-off-by: Peter Maydell --- hw/pl080.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/pl080.c b/hw/pl080.c index 6abe528..26150af 100644 --- a/hw/pl080.c +++ b/hw/pl080.c @@ -281,7 +281,8 @@ static uint64_t pl080_read(void *opaque, hwaddr offset, return s->sync; default: bad_offset: - hw_error("pl080_read: Bad offset %x\n", (int)offset); + qemu_log_mask(LOG_GUEST_ERROR, + "pl080_read: Bad offset %x\n", (int)offset); return 0; } } @@ -327,12 +328,13 @@ static void pl080_write(void *opaque, hwaddr offset, case 10: /* SoftLBReq */ case 11: /* SoftLSReq */ /* ??? Implement these. */ - hw_error("pl080_write: Soft DMA not implemented\n"); + qemu_log_mask(LOG_UNIMP, "pl080_write: Soft DMA not implemented\n"); break; case 12: /* Configuration */ s->conf = value; if (s->conf & (PL080_CONF_M1 | PL080_CONF_M1)) { - hw_error("pl080_write: Big-endian DMA not implemented\n"); + qemu_log_mask(LOG_UNIMP, + "pl080_write: Big-endian DMA not implemented\n"); } pl080_run(s); break; @@ -341,7 +343,8 @@ static void pl080_write(void *opaque, hwaddr offset, break; default: bad_offset: - hw_error("pl080_write: Bad offset %x\n", (int)offset); + qemu_log_mask(LOG_GUEST_ERROR, + "pl080_write: Bad offset %x\n", (int)offset); } pl080_update(s); }