From patchwork Thu Feb 23 18:29:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 94398 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp344118qgi; Thu, 23 Feb 2017 10:41:25 -0800 (PST) X-Received: by 10.200.58.101 with SMTP id w92mr7714199qte.292.1487875285000; Thu, 23 Feb 2017 10:41:25 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id y36si3909483qty.52.2017.02.23.10.41.24 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 23 Feb 2017 10:41:24 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60235 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgyKQ-0006Xc-MU for patch@linaro.org; Thu, 23 Feb 2017 13:41:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44404) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgy9C-0004Nn-V0 for qemu-devel@nongnu.org; Thu, 23 Feb 2017 13:29:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cgy9B-0006el-VV for qemu-devel@nongnu.org; Thu, 23 Feb 2017 13:29:46 -0500 Received: from mail-wr0-x229.google.com ([2a00:1450:400c:c0c::229]:34507) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cgy9B-0006dX-Oq for qemu-devel@nongnu.org; Thu, 23 Feb 2017 13:29:45 -0500 Received: by mail-wr0-x229.google.com with SMTP id z61so27005879wrc.1 for ; Thu, 23 Feb 2017 10:29:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1KXA5KwXZSok3ABWG8NWl4fzC0thcYoHp+qAltY0myc=; b=g/TXz504bLmBh4FFm3VmCnVXgYiqn6ahEHBTMQ3rGFTb+whc7llnVy310YbFjuCJyV RRx72YUYbMPq1kvs+lD/CuuH0XZEcqKZDixPOUQVbSvtIoJC0Knp6BTrtqSE2AhD2LXA hP0hxJFkgcF67KM9SxfcgDrxyvNkAtC9zFubE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1KXA5KwXZSok3ABWG8NWl4fzC0thcYoHp+qAltY0myc=; b=K0eXXayTnDQh2PazEcEQp0pXEwHk6EybRi2ZhzQ5mCElow7+W+09/FbjgrkXpte75b ibWyGDNIzFGOT1rfNlNF4ulWdvfkHOIDmfMgWKY11nydwLWBP2NBD4voWh7L2iRZYFmh Ncdk3uIgbRQVVf/zai+oZXRR3QXVuLZWU8DMtUKDUEIczl/MPOHnBzSYgOW1m/AQYtZK a3sbKXTCggJZnnZp92AtFWqnOSV93BHJgTVUgsbkB2NdM784AeAyvdjH5WClw+lftA0z gCqxCzfZxbnSCxotKJEhE0pKxvlaGxv78SzqObx/CwBdS+Rm/6hUvmoyODX1GHtgewnE g51w== X-Gm-Message-State: AMke39lQAz7pkjne1Dm3pyQqUJdk+k39xB9So09jbpi2/8YGhEVXEz5j4ytZ9G3LlECkuNuP X-Received: by 10.223.174.247 with SMTP id y110mr29683420wrc.166.1487874584710; Thu, 23 Feb 2017 10:29:44 -0800 (PST) Received: from zen.linaro.local (host109-151-49-69.range109-151.btcentralplus.com. [109.151.49.69]) by smtp.gmail.com with ESMTPSA id g23sm7407868wme.27.2017.02.23.10.29.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Feb 2017 10:29:36 -0800 (PST) Received: from zen.home (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 51DEB3E0865; Thu, 23 Feb 2017 18:29:28 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: rth@twiddle.net, peter.maydell@linaro.org Date: Thu, 23 Feb 2017 18:29:17 +0000 Message-Id: <20170223182927.7166-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170223182927.7166-1-alex.bennee@linaro.org> References: <20170223182927.7166-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c0c::229 Subject: [Qemu-devel] [PATCH v14 14/24] cputlb: tweak qemu_ram_addr_from_host_nofail reporting X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mttcg@listserver.greensocs.com, nikunj@linux.vnet.ibm.com, Peter Crosthwaite , jan.kiszka@siemens.com, mark.burton@greensocs.com, a.rigo@virtualopensystems.com, qemu-devel@nongnu.org, cota@braap.org, serge.fdrv@gmail.com, pbonzini@redhat.com, bobby.prani@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , bamvor.zhangjian@linaro.org, fred.konrad@greensocs.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This moves the helper function closer to where it is called and updates the error message to report via error_report instead of the deprecated fprintf. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- cputlb.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) -- 2.11.0 diff --git a/cputlb.c b/cputlb.c index af0e65cd2c..94fa9977c5 100644 --- a/cputlb.c +++ b/cputlb.c @@ -246,18 +246,6 @@ void tlb_reset_dirty_range(CPUTLBEntry *tlb_entry, uintptr_t start, } } -static inline ram_addr_t qemu_ram_addr_from_host_nofail(void *ptr) -{ - ram_addr_t ram_addr; - - ram_addr = qemu_ram_addr_from_host(ptr); - if (ram_addr == RAM_ADDR_INVALID) { - fprintf(stderr, "Bad ram pointer %p\n", ptr); - abort(); - } - return ram_addr; -} - void tlb_reset_dirty(CPUState *cpu, ram_addr_t start1, ram_addr_t length) { CPUArchState *env; @@ -469,6 +457,18 @@ static void report_bad_exec(CPUState *cpu, target_ulong addr) log_cpu_state_mask(LOG_GUEST_ERROR, cpu, CPU_DUMP_FPU | CPU_DUMP_CCOP); } +static inline ram_addr_t qemu_ram_addr_from_host_nofail(void *ptr) +{ + ram_addr_t ram_addr; + + ram_addr = qemu_ram_addr_from_host(ptr); + if (ram_addr == RAM_ADDR_INVALID) { + error_report("Bad ram pointer %p", ptr); + abort(); + } + return ram_addr; +} + /* NOTE: this function can trigger an exception */ /* NOTE2: the returned address is not exactly the physical address: it * is actually a ram_addr_t (in system mode; the user mode emulation