From patchwork Fri Feb 24 11:20:59 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: 94438 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp648287qgi; Fri, 24 Feb 2017 03:36:09 -0800 (PST) X-Received: by 10.55.77.198 with SMTP id a189mr2120061qkb.318.1487936169408; Fri, 24 Feb 2017 03:36:09 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id j15si5433570qta.268.2017.02.24.03.36.08 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 24 Feb 2017 03:36:09 -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]:36364 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chEAQ-000599-OG for patch@linaro.org; Fri, 24 Feb 2017 06:36:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45579) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1chDwG-0007IB-FO for qemu-devel@nongnu.org; Fri, 24 Feb 2017 06:21:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1chDwF-0000QU-7P for qemu-devel@nongnu.org; Fri, 24 Feb 2017 06:21:28 -0500 Received: from mail-wr0-x22d.google.com ([2a00:1450:400c:c0c::22d]:35695) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1chDwF-0000PP-0x for qemu-devel@nongnu.org; Fri, 24 Feb 2017 06:21:27 -0500 Received: by mail-wr0-x22d.google.com with SMTP id g10so9238029wrg.2 for ; Fri, 24 Feb 2017 03:21:26 -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=j+oxSqAtL1AzQ3gPt944LrfqNoKFlnIl+Tj0R7jIgbfF0LCioEOFJpOGNpqYJf/F4o /NzEeuM+zWIHxgakvLFLry5uLmh6Gjm8g/QcAPysv2aeo3iVlJ2aQsUtt8G/I/VBZGtd eUDUJMLxvfSKxoj1wBP8b3jk5wP3ab0wASOuI= 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=enE00e3VN3wDl5jS1p7pJDKNh5Ck5l2DEL0uW+JCfbWStT4aM6ZVFy3thwZp7LVjHH h/IH5TBkHOxDfwG1ss7tunpOLAxnHYYESWD12Z8fbt4Mvd3WV4sFpKITmmbS14t1dXJo XXjidLHpkCKaDwmdBZhxltHtIL3zRFctYoE8jv3a33/21ZgCkE/Hyr8okIVt1cF/vp6B fZ5QbN4eSnBgiv/HbKDn8FxKGsHdTj3UKGO4N1QqWW0a9NeeiAHYx3cl+RRvtu6BC7Rh cb2B4pnxS7DNL3mDHQ0TNRJ3auleF6tJShjta8RB0j55jAqLU7Lxfju38RDCv7L40YuV zKBg== X-Gm-Message-State: AMke39kexCdnXmPiXygmHB4N3DY+rUacFHu7J9iU+Jc+neWTVt2DjiSSryzYQzuW+zCg7/Ve X-Received: by 10.223.160.14 with SMTP id k14mr2288780wrk.69.1487935286106; Fri, 24 Feb 2017 03:21:26 -0800 (PST) Received: from zen.linaro.local (host5-81-235-77.range5-81.btcentralplus.com. [5.81.235.77]) by smtp.gmail.com with ESMTPSA id o50sm9988597wrc.56.2017.02.24.03.21.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Feb 2017 03:21:24 -0800 (PST) Received: from zen.home (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 3D8823E0865; Fri, 24 Feb 2017 11:21:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 24 Feb 2017 11:20:59 +0000 Message-Id: <20170224112109.3147-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170224112109.3147-1-alex.bennee@linaro.org> References: <20170224112109.3147-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::22d Subject: [Qemu-devel] [PULL 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: Paolo Bonzini , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, 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