From patchwork Thu Oct 18 13:11:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 12340 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 D234823DE2 for ; Thu, 18 Oct 2012 13:11:56 +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 85642A1897F for ; Thu, 18 Oct 2012 13:11:56 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so13185429iej.11 for ; Thu, 18 Oct 2012 06:11:56 -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=LrLDDL8z+o0k92FVsGBRcAhAyCz3o36cJ0tAlIhFog4=; b=e0TQOD1fwP7eCZYDMIg7ukt21fZC4LXEiRyFa73Fp4zd+IRJd4kprpxPQA/B9lSFMD IduYAykcBDvfJgzOFmMONF1olwscEPkMrfJkiOcwOQo3DR9zTmNuyQxgAKsOmIBv+afg blXeN7fHWZIz5xiVT6Vyne2otAR/T0V/KPzPh7KuI8WnWxoOy1SnBp2s4WLQa7oWrJ1y zLWMLn8uu0iBQhWh4QhwmO8eLzGhxOCImELW70BovSESijkx7Fn9jpeSUgDo22FwWv51 vKj/RsrXu1Tyforfu2t5DPXF5fipTPt8VdkS2wtBMcHAbDn+Ipk4+kFgBwpyaQYOdOFX TqqA== Received: by 10.50.194.169 with SMTP id hx9mr4617228igc.70.1350565916306; Thu, 18 Oct 2012 06:11:56 -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 n20csp1069442igt; Thu, 18 Oct 2012 06:11:55 -0700 (PDT) Received: by 10.180.106.2 with SMTP id gq2mr11261178wib.18.1350565914792; Thu, 18 Oct 2012 06:11:54 -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 z13si27407696wep.125.2012.10.18.06.11.54 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Oct 2012 06:11:54 -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-0006Ej-KM; 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 5/8] hw/pl190: Use LOG_GUEST_ERROR Date: Thu, 18 Oct 2012 14:11:39 +0100 Message-Id: <1350565902-23940-6-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: ALoCoQmuAcs8Z4N22Xdo2pLVDy0p67su+iGvuKFsKJ01TdfhQ/E8zsHwC1tDeVceqPiE+Y4ivvap 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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/pl190.c b/hw/pl190.c index 7332f4d..961da5b 100644 --- a/hw/pl190.c +++ b/hw/pl190.c @@ -143,7 +143,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 +203,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);