From nobody Fri May  9 04:46:55 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
 permitted sender)
  smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
	dmarc=pass(p=none dis=none)  header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1591375971; cv=none;
	d=zohomail.com; s=zohoarc;
	b=DOp3DpVkhRUZbT6pVFxpfvTPH1e9smb1lenxZyzQ0Nioe4RRs1YM+ZkOHVareKXTcG2+rsVI23sOxCd0txiaUFRg1l+FgDn/15rdHv++j5HyNvhhif+6rf0nSMr/lRAX3zKd0WOS05Uxwcd3tmOpePWiggaZHEME6uMkt6C1ukg=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1591375971;
 h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
	bh=2W0hZmJmprXTXvmQPYEl3pMM+b1VTyiikXeZP4VVDCo=;
	b=BVxHHEJxGFaJhfNzbwuvCB7VHHU6hr8ux8lg1xlplJAhiO2pBVqNe1UDAos1EQdcJAXjjCosfoytPZ9Z8YRbXuJGA4WQEXCNwHQHxPl67gsO8UI66ktT1sTQTkPVvo+p0mXmAd+nOJR8cVIX3yyuYzioBEnEUG6QZsJ5uCT3ijM=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
 permitted sender)
  smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
	dmarc=pass header.from=<peter.maydell@linaro.org> (p=none dis=none)
 header.from=<peter.maydell@linaro.org>
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
 mx.zohomail.com
	with SMTPS id 1591375971148749.2834469487171;
 Fri, 5 Jun 2020 09:52:51 -0700 (PDT)
Received: from localhost ([::1]:57820 helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
	id 1jhFaL-0006Pq-SG
	for importer@patchew.org; Fri, 05 Jun 2020 12:52:49 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:40462)
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
 id 1jhFXs-0001BI-5s
 for qemu-devel@nongnu.org; Fri, 05 Jun 2020 12:50:16 -0400
Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:38728)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>)
 id 1jhFXq-0001dy-MH
 for qemu-devel@nongnu.org; Fri, 05 Jun 2020 12:50:15 -0400
Received: by mail-wm1-x341.google.com with SMTP id f185so9782452wmf.3
 for <qemu-devel@nongnu.org>; Fri, 05 Jun 2020 09:50:14 -0700 (PDT)
Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148])
 by smtp.gmail.com with ESMTPSA id c140sm12272724wmd.18.2020.06.05.09.50.12
 for <qemu-devel@nongnu.org>
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Fri, 05 Jun 2020 09:50:12 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
 h=from:to:subject:date:message-id:in-reply-to:references:mime-version
 :content-transfer-encoding;
 bh=2W0hZmJmprXTXvmQPYEl3pMM+b1VTyiikXeZP4VVDCo=;
 b=vhXk41YNLDta19kH6i1sDaAlHGnb/sY7HtNDvgflsmmZ+DwdXqdmxtwFyYQinUPqXz
 rm/8MWHlpPQjGuIWUUY9vl4wWnC9uBliua+TYah/yYBzidTzVL2KEsA7ApHH1MZJVAcU
 5/uG0rDJB9/wSSkzZQ46ioFPT4TD5Xzd2VRtxSqhZ9Ir+8gwOrJkrR5vZZSMNPg+Jnmr
 s0TDrMVvVE0pfdv/R3brWC8+r5jshs74ZyhaPq39IuW/2wqnEetC6PFavujQByTDntJo
 RGRzRVDs11RinleYOLBOY8rrG+lO8gG6RuHdcOuwGDcN6C0SD3GwWbDSLgOVowubyQ1Q
 dYTA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=2W0hZmJmprXTXvmQPYEl3pMM+b1VTyiikXeZP4VVDCo=;
 b=H0fCA9RZdqk7Ka1pbqQKRKrtmi8aQzX7B/S2jTfkxTaZvVfXCY0t6gt0gVfCd1OUC9
 QbVinSJ8hJqr7Lww7LSJcYVYntKBOqe6Rw6pxWt2BKjyGJYGlmF3RPcZ95BNXgDpf8JR
 eRdIXT3XbQuXP5RXc4tCQZPBISUwL6BRFz8yCFxZu+oaO3pdjY4EYKmH/yeI/PP6hW7h
 K485RxzJWMuxeeMqjtT11y6ZWNUQlvkOoSD0cfyawApwITkoD4O/CVCDydeTfTjuz2YM
 pms48bs/QmF3wCqU6RxO19hsrbQSIwn5+iaKJZdsFzg7WA79bCVETbaFTip/ZsbvQJhe
 Z9ow==
X-Gm-Message-State: AOAM531CYpgTpBVgs20xn5EQZJpjw5noALtMwKv1WvqGWStEfKa3Dk2M
 B8O0bK/3EAotHZWZ+ewcejjxVXQZ23mUyA==
X-Google-Smtp-Source: 
 ABdhPJxMEr+ZnCLOe7lWNNjTnd9p5hxs+luGWp8KGC+x9tAWGBlJSUQycZaTMo4KQtq+lfAQ/z4cYQ==
X-Received: by 2002:a7b:ce88:: with SMTP id q8mr3533881wmj.176.1591375812952;
 Fri, 05 Jun 2020 09:50:12 -0700 (PDT)
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 03/29] hw/input/pxa2xx_keypad: Replace hw_error() by
 qemu_log_mask()
Date: Fri,  5 Jun 2020 17:49:41 +0100
Message-Id: <20200605165007.12095-4-peter.maydell@linaro.org>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20200605165007.12095-1-peter.maydell@linaro.org>
References: <20200605165007.12095-1-peter.maydell@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
 as permitted sender) client-ip=209.51.188.17;
 envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
 helo=lists.gnu.org;
Received-SPF: pass client-ip=2a00:1450:4864:20::341;
 envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x341.google.com
X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache.
 That's all we know.
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
 DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
 RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001,
 URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: pass (identity @linaro.org)

From: Philippe Mathieu-Daud=C3=A9 <f4bug@amsat.org>

hw_error() calls exit(). This a bit overkill when we can log
the accesses as unimplemented or guest error.

When fuzzing the devices, we don't want the whole process to
exit. Replace some hw_error() calls by qemu_log_mask()
(missed in commit 5a0001ec7e).

Signed-off-by: Philippe Mathieu-Daud=C3=A9 <f4bug@amsat.org>
Message-id: 20200525114123.21317-2-f4bug@amsat.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/input/pxa2xx_keypad.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/hw/input/pxa2xx_keypad.c b/hw/input/pxa2xx_keypad.c
index 31862a7d16c..62aa6f6b15a 100644
--- a/hw/input/pxa2xx_keypad.c
+++ b/hw/input/pxa2xx_keypad.c
@@ -12,7 +12,7 @@
  */
=20
 #include "qemu/osdep.h"
-#include "hw/hw.h"
+#include "qemu/log.h"
 #include "hw/irq.h"
 #include "migration/vmstate.h"
 #include "hw/arm/pxa.h"
@@ -233,7 +233,9 @@ static uint64_t pxa2xx_keypad_read(void *opaque, hwaddr=
 offset,
         return s->kpkdi;
         break;
     default:
-        hw_error("%s: Bad offset " REG_FMT "\n", __func__, offset);
+        qemu_log_mask(LOG_GUEST_ERROR,
+                      "%s: Bad read offset 0x%"HWADDR_PRIx"\n",
+                      __func__, offset);
     }
=20
     return 0;
@@ -280,7 +282,9 @@ static void pxa2xx_keypad_write(void *opaque, hwaddr of=
fset,
         break;
=20
     default:
-        hw_error("%s: Bad offset " REG_FMT "\n", __func__, offset);
+        qemu_log_mask(LOG_GUEST_ERROR,
+                      "%s: Bad write offset 0x%"HWADDR_PRIx"\n",
+                      __func__, offset);
     }
 }
=20
--=20
2.20.1