From patchwork Thu Aug 11 15:24:22 2016 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: 73786 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp181292qga; Thu, 11 Aug 2016 09:01:24 -0700 (PDT) X-Received: by 10.200.52.182 with SMTP id w51mr11958700qtb.90.1470931284170; Thu, 11 Aug 2016 09:01:24 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s7si1945058qtc.72.2016.08.11.09.01.23 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 11 Aug 2016 09:01:24 -0700 (PDT) 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 dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49371 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXsQ7-0007Fn-IT for patch@linaro.org; Thu, 11 Aug 2016 12:01:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58811) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXrwa-00021s-Fj for qemu-devel@nongnu.org; Thu, 11 Aug 2016 11:30:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bXrwZ-0007tH-2S for qemu-devel@nongnu.org; Thu, 11 Aug 2016 11:30:51 -0400 Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]:37803) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bXrwY-0007tD-Ru for qemu-devel@nongnu.org; Thu, 11 Aug 2016 11:30:50 -0400 Received: by mail-wm0-x232.google.com with SMTP id i5so3644531wmg.0 for ; Thu, 11 Aug 2016 08:30:50 -0700 (PDT) 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=0JSn/cTM2Sz6QmxV4XvWQwAK12mq344tmjCOn/gbsSU=; b=PtZTwPTOoCQpyE+LDvUGqGf+9ABTKgqpgn48B9jrj9LHcy5vqs07zdjrZVIMlvPquc 3oM8/fouOzehe32oJg5yOd0BLXrZRZZ33WaYb+hlNPJl9/g2+BHuK1M6+zGVPeMKGXpA BffyB+Y2MTsjpDXlQG+BfZC6E9ERL2uDpYAJk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0JSn/cTM2Sz6QmxV4XvWQwAK12mq344tmjCOn/gbsSU=; b=h47/ggh1K4whgcZUrMRIfpYABp1uWnNUfMyTLHvlaqXdVr6drQ/eNKNjpgFEGRNFi+ U+ipWBEa57/qL2EgVYfgVxda/Sy9OKcVZg7tv1V5D5nJjpbMDkCaUwov4U1NUORCNUNp S0ESbXtZGRu1i0UDpjvfZn5YC1UirGI3R/7b8ggLbJG7sYVmzt7Sok1oX7+ZilcU4jSo Mb9FfBuHciCFA77ex5lNxaltr4UHgJARAjTXP60Lo3T3uwZUkEQoScMl7HADYsZyLh2X fa3zPepDm7z3mRNxY9HDxnXw6LUJftRgQUnk77z8OGU91yZHCqqPH1s+idbe0Od2NCpD d6ow== X-Gm-Message-State: AEkoouuSRfHshgCKUONvVkgoAOvqpJPwhHX9knG2+03u9AWwygKayFg5qODZRTEaugnFFcp0 X-Received: by 10.28.109.214 with SMTP id b83mr9538114wmi.19.1470929450157; Thu, 11 Aug 2016 08:30:50 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id m62sm294342wmm.24.2016.08.11.08.30.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Aug 2016 08:30:49 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id C6B163E0357; Thu, 11 Aug 2016 16:24:31 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=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, 11 Aug 2016 16:24:22 +0100 Message-Id: <1470929064-4092-27-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1470929064-4092-1-git-send-email-alex.bennee@linaro.org> References: <1470929064-4092-1-git-send-email-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::232 Subject: [Qemu-devel] [RFC v4 26/28] 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=20Benn=C3=A9e?= , 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.7.4 diff --git a/cputlb.c b/cputlb.c index 2975bbe..945ea02 100644 --- a/cputlb.c +++ b/cputlb.c @@ -293,18 +293,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; @@ -516,6 +504,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