From patchwork Fri Jan 27 10:34: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: 92612 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp176199qgi; Fri, 27 Jan 2017 03:00:16 -0800 (PST) X-Received: by 10.200.37.125 with SMTP id 58mr7281374qtn.232.1485514816614; Fri, 27 Jan 2017 03:00:16 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id n2si3273494qtn.164.2017.01.27.03.00.16 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 27 Jan 2017 03:00:16 -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]:44342 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cX4GM-0005Ql-70 for patch@linaro.org; Fri, 27 Jan 2017 06:00:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48017) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cX3sK-0007vu-TI for qemu-devel@nongnu.org; Fri, 27 Jan 2017 05:35:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cX3sK-0002Dq-2V for qemu-devel@nongnu.org; Fri, 27 Jan 2017 05:35:24 -0500 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:38549) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cX3sJ-0002Di-Sc for qemu-devel@nongnu.org; Fri, 27 Jan 2017 05:35:23 -0500 Received: by mail-wm0-x236.google.com with SMTP id r144so129835080wme.1 for ; Fri, 27 Jan 2017 02:35:23 -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=d3UArYWykxog43Y/LWqV26HPC8fYOFQSxJQO7rj2W38qeVyhqPHOdB/3TfG1eGlANY u4nHslRq1IUNU64LBxA3o8wgywv0STcadmwFW/Vim7m9zushc8ueYBn0OHtRewL+D8s7 tnFGLJGTrfYJVdnlEm6TaslophXLzmFfNskHg= 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=fc2uerVQ84dEg50K/N10q9qsGtqbKWgsh7JVjr+2GX1s5fqA+IPrzCV6QOlv+E990e KY+TX2bONDOF0DJFBBgIa2XtIjmxQydXl9otIpR30jB+N7jLOcxCzxmEb1ihDQDCM6Pc pH1MMEyBpL8KIWXGtA5BJKXiSYj/A6u7zJ7t6Oy5vEK35Z2BD1Wbigx5eBAc2rbjKvbX 4prWQRfuCn3EeDakZfC7SUcbbevb9NgvJGLmtS/IEUOaAoiDftJxkWdcD1VhvncsA9vk 8h7uEYwTkxygzBbxowYIM8lNA3nqPv3+axAeA0YPpCd30TN39z69+/kXLAxzL4Z321cH Y2Yg== X-Gm-Message-State: AIkVDXLqyHWmX5eNyRv8oN2AMDZTLwizfrX9wNA2w6RH46xPFBgRwdMlYumPZNBE7dJe15fh X-Received: by 10.28.154.70 with SMTP id c67mr2731818wme.90.1485513322866; Fri, 27 Jan 2017 02:35:22 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g5sm7175286wrd.0.2017.01.27.02.35.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Jan 2017 02:35:17 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 994313E3766; Fri, 27 Jan 2017 10:35:06 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: Date: Fri, 27 Jan 2017 10:34:54 +0000 Message-Id: <20170127103505.18606-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170127103505.18606-1-alex.bennee@linaro.org> References: <20170127103505.18606-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::236 Subject: [Qemu-devel] [PATCH v8 14/25] 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: Paolo Bonzini , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9e?= , "open list:Overall" , Peter Crosthwaite 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