From patchwork Sun Oct 14 13:11:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 12210 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 5A28723FB3 for ; Sun, 14 Oct 2012 13:11:22 +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 0AFB6A18C73 for ; Sun, 14 Oct 2012 13:11:21 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id f6so3022270iag.11 for ; Sun, 14 Oct 2012 06:11:21 -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=dVdWkAPiASnXYjBgtzuQCu027zf0kv8N6I9qkQwG6aY=; b=Q+3hktzZ3mN08AMighVVWks+tha5mBLE/z+AI/Go6eNewNKzpDOjsBKjXKcBFCXC7S pMiVjL2dCOvwBbu4oHXeQXD+KAVgwuLIfPT0TuTFSt9FLj0aqQUvSmXSDjzva+yD2o5Y 2T0t6azA3mmJSmJP4ieouM5VUQ2taMO+ehXxvflWfwnSRYegQ8sh3TiV6EBu22KKdhsz XgtGRHBZ5VUgYooRHHSCJcwrDrcK589m3vdd9FhSC52RMTDZ9ANaFcJ9E2uIiNdZVGgt oSGrKrR3x5antf9Y61qYVTckD51aDk2Sa5k1pKK0UDNdK7b1O/wuyH92tMDZXQRgQPZq 5g8Q== Received: by 10.50.77.138 with SMTP id s10mr6310245igw.70.1350220281500; Sun, 14 Oct 2012 06:11:21 -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 n20csp450970igt; Sun, 14 Oct 2012 06:11:20 -0700 (PDT) Received: by 10.68.134.99 with SMTP id pj3mr28261141pbb.13.1350220280481; Sun, 14 Oct 2012 06:11:20 -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 ps1si18754503pbc.108.2012.10.14.06.11.19 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 14 Oct 2012 06:11:20 -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-0004GG-8w; Sun, 14 Oct 2012 14:11:16 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Blue Swirl Subject: [PATCH 4/7] hw/pl190: Use LOG_GUEST_ERROR Date: Sun, 14 Oct 2012 14:11:13 +0100 Message-Id: <1350220276-16349-5-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: ALoCoQlm0H4c1DPaokR39dVXeXcRoM6iIvHYsJsmIAOriDiDRlL+AN/+AyV56KD4DPBdp9zdhDog If the guest attempts an offset to a nonexistent register, just log this via LOG_GUEST_ERROR rather than killing QEMU with a hw_error. Signed-off-by: Peter Maydell --- hw/pl190.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/pl190.c b/hw/pl190.c index 7332f4d..e8b2fc4 100644 --- a/hw/pl190.c +++ b/hw/pl190.c @@ -8,6 +8,7 @@ */ #include "sysbus.h" +#include "qemu-log.h" /* The number of virtual priority levels. 16 user vectors plus the unvectored IRQ. Chained interrupts would require an additional level @@ -143,7 +144,8 @@ static uint64_t pl190_read(void *opaque, target_phys_addr_t offset, case 13: /* DEFVECTADDR */ return s->vect_addr[16]; default: - hw_error("pl190_read: Bad offset %x\n", (int)offset); + qemu_log_mask(LOG_GUEST_ERROR, + "pl190_read: Bad offset %x\n", (int)offset); return 0; } } @@ -202,7 +204,8 @@ static void pl190_write(void *opaque, target_phys_addr_t offset, } break; default: - hw_error("pl190_write: Bad offset %x\n", (int)offset); + qemu_log_mask(LOG_GUEST_ERROR, + "pl190_write: Bad offset %x\n", (int)offset); return; } pl190_update(s);