From patchwork Thu Oct 27 15:10:23 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: 79742 Delivered-To: patch@linaro.org Received: by 10.80.142.83 with SMTP id 19csp722909edx; Thu, 27 Oct 2016 08:57:41 -0700 (PDT) X-Received: by 10.176.83.12 with SMTP id x12mr6973610uax.131.1477583861825; Thu, 27 Oct 2016 08:57:41 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 185si3608526vkb.218.2016.10.27.08.57.41 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 27 Oct 2016 08:57:41 -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]:42471 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzn3l-0000RG-2d for patch@linaro.org; Thu, 27 Oct 2016 11:57:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45690) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzmTV-0003wY-9L for qemu-devel@nongnu.org; Thu, 27 Oct 2016 11:20:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzmTR-0004cp-0K for qemu-devel@nongnu.org; Thu, 27 Oct 2016 11:20:13 -0400 Received: from mail-wm0-x22a.google.com ([2a00:1450:400c:c09::22a]:36997) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1bzmTQ-0004bO-Ow for qemu-devel@nongnu.org; Thu, 27 Oct 2016 11:20:08 -0400 Received: by mail-wm0-x22a.google.com with SMTP id 140so29777735wmv.0 for ; Thu, 27 Oct 2016 08:20:08 -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=tS2ec7+oVmu6rk+inIZq8WgPUufgMRwRinNAq3HwqRU=; b=PAIJTEsjXH2PjvBqSTaRDv5BsjjY3t9NchBVLaFAc7n4XjCuSDMwsX4izAHMoytkdI +TIQNUORh0ITFyp0rUVtQsFaD7B45ScQhDN9ZPDMmuIFD8JMJ0vSydJW/fTiSdFKFuuv LThZxIpGrQMYUeIRwXXwZ0sjX3IEiTFdqZzjo= 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=tS2ec7+oVmu6rk+inIZq8WgPUufgMRwRinNAq3HwqRU=; b=aWMPcWt0r4vBmb/pHOmn39oJMU6fZ7S+g00Av+XO5z+k1imzadS2vTPbbgKfNtYaVj jM8D+LbEfAX2n/4Nck1iz6gKmlvGYPl4yCib6/Kgk1wiNBqU/JXd0UpOVFV4PU9rAJQV 8sPWZ52vcBkSBgUEVf3qC2dzjA/IBnzjZ9CuiVzPPodgaC+GCcRoffgsqEuLT++RVCWD KN7jxlu1K/cgDdGpK4m405f+IsAQ6OYMMz4Dvu7TZ/B2aFkIJ/Uaka60eKnVnKah2N5k Lzj947D5umyp2an6K1lvrCNIX2Cid1VP0TykcUVf/o27nbsUxnTVqVX2qdJltwSB+eSS fbWg== X-Gm-Message-State: ABUngvdtBwWr2jqiwTDeehqfKoS5FWrwjQwRfz95tvwy9fmiP5yB9ssShdJ5M9ctc3dI/1Mt X-Received: by 10.28.226.136 with SMTP id z130mr9261263wmg.0.1477581597025; Thu, 27 Oct 2016 08:19:57 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id cy7sm9030988wjc.26.2016.10.27.08.19.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Oct 2016 08:19:55 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 2B0163E047F; Thu, 27 Oct 2016 16:11:01 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: pbonzini@redhat.com Date: Thu, 27 Oct 2016 16:10:23 +0100 Message-Id: <20161027151030.20863-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161027151030.20863-1-alex.bennee@linaro.org> References: <20161027151030.20863-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::22a Subject: [Qemu-devel] [PATCH v5 26/33] 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, peter.maydell@linaro.org, claudio.fontana@huawei.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, bobby.prani@gmail.com, rth@twiddle.net, =?UTF-8?q?Alex=20Benn=C3=A9e?= , 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 --- cputlb.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) -- 2.10.1 diff --git a/cputlb.c b/cputlb.c index 4190d9c..614c0b3 100644 --- a/cputlb.c +++ b/cputlb.c @@ -321,18 +321,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; @@ -544,6 +532,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