From patchwork Thu Jan 19 17:04:54 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: 92007 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp392748qgi; Thu, 19 Jan 2017 09:38:56 -0800 (PST) X-Received: by 10.55.182.65 with SMTP id g62mr9237631qkf.6.1484847536435; Thu, 19 Jan 2017 09:38:56 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id a2si3032800qkg.331.2017.01.19.09.38.56 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 19 Jan 2017 09:38:56 -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]:49981 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUGfl-0002wI-SS for patch@linaro.org; Thu, 19 Jan 2017 12:38:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38860) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cUG9R-0007df-Am for qemu-devel@nongnu.org; Thu, 19 Jan 2017 12:05:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cUG9Q-0007tT-IF for qemu-devel@nongnu.org; Thu, 19 Jan 2017 12:05:29 -0500 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]:38889) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cUG9Q-0007t5-DI for qemu-devel@nongnu.org; Thu, 19 Jan 2017 12:05:28 -0500 Received: by mail-wm0-x22b.google.com with SMTP id r144so2721405wme.1 for ; Thu, 19 Jan 2017 09:05:28 -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=m50uCcapu1zN1eVbZT+dS3v2MAqwjWc2479PBs1CPNo=; b=kIjVvbQ1PiibiSuoIjBUX6Q+gdhDhwHOyduoSSA5FmCW2/K3tAC1+DwSRuD1Wb03lg 5t/SDHCOV6ab1BdENBQQ666I9UwCfHwlm4mTCbC7BceVe6PoGsga0O0nMZQZJ0WxMt3D 3THjxcnuUFY165anKfJiq3SySXGAtOdcp4kww= 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=m50uCcapu1zN1eVbZT+dS3v2MAqwjWc2479PBs1CPNo=; b=rdpX0GqUok8TiAKLcSlXaE4EZ+RxIlKL/fQeY8MIzkJ77r2B3ct/IweOPahHnaoOyn P5/QaP+SSxyjjYJGz54W5EzvrxQ5HhfngXC7QCSsbW95VoJJ+O68y/KD8hyrG3fnLMAZ toI1lLuceIx8gl5e1dwsh8JPHmtv0gJ4aqUmWRDaEuVbOTkGYlYSP4mcb7ZWBUPvFb6n Hhmdgj4QGPYpKmVlEbQIwMSYZ+oCBsAkG0o06+1OBkV/qyIb7V0xCkbim6QK903j+Edr Pb56uwDqN8q1xvE6YD5IqjuUueVXhrsoLM/DLjcGozUhesEu0ixGjejVgm/MYTd0xNfr dFfA== X-Gm-Message-State: AIkVDXIouHg4Gr+Fy6a5IMVF69+b00mkvhDsgUpWrfik7coGB7KJHaf52iEIl+b7SDY9QgiU X-Received: by 10.28.84.14 with SMTP id i14mr23116588wmb.51.1484845527422; Thu, 19 Jan 2017 09:05:27 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id d29sm14039880wmi.19.2017.01.19.09.05.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jan 2017 09:05:21 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id BE54F3E2A2D; Thu, 19 Jan 2017 17:05:08 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: mttcg@listserver.greensocs.com, qemu-devel@nongnu.org, fred.konrad@greensocs.com, a.rigo@virtualopensystems.com, cota@braap.org, bobby.prani@gmail.com, nikunj@linux.vnet.ibm.com Date: Thu, 19 Jan 2017 17:04:54 +0000 Message-Id: <20170119170507.16185-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170119170507.16185-1-alex.bennee@linaro.org> References: <20170119170507.16185-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:c09::22b Subject: [Qemu-devel] [PATCH v7 14/27] 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: peter.maydell@linaro.org, claudio.fontana@huawei.com, Peter Crosthwaite , jan.kiszka@siemens.com, mark.burton@greensocs.com, serge.fdrv@gmail.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , bamvor.zhangjian@linaro.org, rth@twiddle.net 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 --- cputlb.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) -- 2.11.0 Reviewed-by: Richard Henderson 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