From patchwork Mon Jun 1 18:04:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 479131 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 168271400A0 for ; Tue, 2 Jun 2015 04:08:58 +1000 (AEST) Received: from localhost ([::1]:53768 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzU8t-0002eL-VR for incoming@patchwork.ozlabs.org; Mon, 01 Jun 2015 14:08:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37771) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzU4e-0002yT-8Z for qemu-devel@nongnu.org; Mon, 01 Jun 2015 14:04:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YzU4a-0008En-5k for qemu-devel@nongnu.org; Mon, 01 Jun 2015 14:04:32 -0400 Received: from mail-ob0-f172.google.com ([209.85.214.172]:36346) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzU4a-0008Ed-2j for qemu-devel@nongnu.org; Mon, 01 Jun 2015 14:04:28 -0400 Received: by obbea2 with SMTP id ea2so109627549obb.3 for ; Mon, 01 Jun 2015 11:04:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=oRhoQmqUZDFna6lJ/as95NOqBe36kJK40aEm7UzOouY=; b=ScICE+/VFg1EMKgRheTS1h5a+NPj6HqcR8VKZXESFWKE0WVnD8P4OrdWwOBXLJIHod Zs/A+dFcPy1Ea3vDtXik10wrGYJoWags+bVQTwiv27TAg+//jmVJS4jiFRT6Jf1xwmIu 5Tl53USFq+3ywqHxNWczMprcBEKJ7eS5hReUnPnQzrolGQjHNeqHQb8WSnYpMSFmaj9C PqAb/qcl+2LYNwX6NlecDCJS97HUciYEQaMKWc+IznD21pP0gzoRNT8gcJ7qi6PkY/J0 53yLJPQ5SxgwiV1ajjWqIoyp8c/3/rrwbn37+lYYCAPBd5seEwXwBvbprkBDglCF7ICK g9FA== X-Gm-Message-State: ALoCoQn3qwYHke4ulp38PBAcrUAU0jkrC59C/PEIbji3i0LxHshpk8paWr1Fp+Lw7tgcuVKmGb7J X-Received: by 10.202.168.21 with SMTP id r21mr18307885oie.32.1433181867817; Mon, 01 Jun 2015 11:04:27 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id t20sm8008145oie.22.2015.06.01.11.04.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Jun 2015 11:04:27 -0700 (PDT) From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Mon, 1 Jun 2015 11:04:26 -0700 Message-Id: <521a9bdbfff0595f785288303a6fb8fd4cb24c5e.1433180153.git.peter.crosthwaite@xilinx.com> X-Mailer: git-send-email 2.4.2.3.g2ffcb72 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.214.172 Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, alistair.francis@xilinx.com, zach.pfeffer@xilinx.com, jues@xilinx.com Subject: [Qemu-devel] [PATCH target-arm v1 5/9] arm: helper: rename get_phys_addr_mpu X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This get_phys_addr is really for pmsav5. Rename it accordingly. Signed-off-by: Peter Crosthwaite Reviewed-by: Peter Maydell --- target-arm/helper.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index f11efea..63859a4 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -5720,9 +5720,9 @@ do_fault: return (1 << 9) | (fault_type << 2) | level; } -static int get_phys_addr_mpu(CPUARMState *env, uint32_t address, - int access_type, ARMMMUIdx mmu_idx, - hwaddr *phys_ptr, int *prot) +static int get_phys_addr_pmsav5(CPUARMState *env, uint32_t address, + int access_type, ARMMMUIdx mmu_idx, + hwaddr *phys_ptr, int *prot) { int n; uint32_t mask; @@ -5857,8 +5857,8 @@ static inline int get_phys_addr(CPUARMState *env, target_ulong address, if (arm_feature(env, ARM_FEATURE_MPU)) { *page_size = TARGET_PAGE_SIZE; - return get_phys_addr_mpu(env, address, access_type, mmu_idx, phys_ptr, - prot); + return get_phys_addr_pmsav5(env, address, access_type, mmu_idx, + phys_ptr, prot); } if (regime_using_lpae_format(env, mmu_idx)) {