From patchwork Mon Feb 13 12:10:07 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: 93854 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1065902qgi; Mon, 13 Feb 2017 04:17:05 -0800 (PST) X-Received: by 10.55.187.67 with SMTP id l64mr22724647qkf.288.1486988225679; Mon, 13 Feb 2017 04:17:05 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id a19si7101868qtc.79.2017.02.13.04.17.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 13 Feb 2017 04:17:05 -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]:56194 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdFZ1-0002OO-6e for patch@linaro.org; Mon, 13 Feb 2017 07:17:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdFSS-0005Q7-6s for qemu-devel@nongnu.org; Mon, 13 Feb 2017 07:10:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdFSQ-0002du-G4 for qemu-devel@nongnu.org; Mon, 13 Feb 2017 07:10:16 -0500 Received: from mail-wr0-x22b.google.com ([2a00:1450:400c:c0c::22b]:36790) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cdFSQ-0002dZ-AS for qemu-devel@nongnu.org; Mon, 13 Feb 2017 07:10:14 -0500 Received: by mail-wr0-x22b.google.com with SMTP id k90so148677285wrc.3 for ; Mon, 13 Feb 2017 04:10:14 -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=UxX4nwialgMhdCu2KG5Kw17WoS2KZZE+mnTU9WRJFDFDalO9y0KKDdZmKaoX8vX2BX h7eBFWKxNB9qmOHQ+hUeKJHykqtFyt88E5je5dCGHqR8UZMHLAfareVMBi6s2FaEPDe2 XV6/NWNkIUFv8ewugc5r1C29BKC+i3XMI56eY= 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=WyGoI0x8Q/CXdq1YXEdBqGevHyr6QJq0uVN0949ErxbUuYJFLc6Dlh3Q7KFgBawJxK 3ZVSrIBFreSW9Zj4IG6Qneym1zRy/dm7irLdcSLfiPUdtWuqGYHPguZjyqze10zYEHex rkmCPvjuTlPM7hJ571n2wQCHvY3ElT5aIMMnZAmkkjL6roQo/RgS68sstJpDkCt/JJTJ 9w4uRI4c2QMlfjOGSrLT6YkQ2D7Y9lSgGyONOKk13zC0DWs2y54ZMnUiQeKU7ZfiH/g4 ZdGao5UZvWZvmFpk6ICTvMzVNE//jgVwYCgHYuaQxV5+0vVOWh2jzIFkcdJU6xQg8BDC B76Q== X-Gm-Message-State: AMke39lFJXcAxpa4fH2pNk82KtMDnwNTkeuoZQLQRJwpLrT+/A+lpumCMJwK3JFI6kUQjTvJ X-Received: by 10.223.168.111 with SMTP id l102mr19271552wrc.150.1486987813270; Mon, 13 Feb 2017 04:10:13 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 40sm13627047wry.22.2017.02.13.04.10.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Feb 2017 04:10:08 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 434463E0C15; Mon, 13 Feb 2017 12:10:18 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, rth@twiddle.net Date: Mon, 13 Feb 2017 12:10:07 +0000 Message-Id: <20170213121017.12907-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170213121017.12907-1-alex.bennee@linaro.org> References: <20170213121017.12907-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::22b Subject: [Qemu-devel] [PATCH v12 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