From patchwork Fri Jun 12 19:10:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 483738 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 5279C140497 for ; Sat, 13 Jun 2015 05:17:08 +1000 (AEST) Received: from localhost ([::1]:53500 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3URu-0001Wo-7M for incoming@patchwork.ozlabs.org; Fri, 12 Jun 2015 15:17:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48311) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3ULq-0007bU-AR for qemu-devel@nongnu.org; Fri, 12 Jun 2015 15:10:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z3ULm-0003Hp-1c for qemu-devel@nongnu.org; Fri, 12 Jun 2015 15:10:50 -0400 Received: from mail-qc0-f180.google.com ([209.85.216.180]:34031) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3ULl-0003He-TK for qemu-devel@nongnu.org; Fri, 12 Jun 2015 15:10:45 -0400 Received: by qcbfb9 with SMTP id fb9so4410966qcb.1 for ; Fri, 12 Jun 2015 12:10:45 -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=4JKF9vBrW9Sr4nekYVi7rOldybmTpVtMK1jJ2WUHqoE=; b=VqLQF8ZX2j/7aZ4OKM67ei89M+bvIhvuwa1UZlxDa7xAkZGYy3uWgQVJleKc3m7xD0 kF1YDO2rAutHbEQOLMVjgu91WI+rRX1+mhRd+kJIe1daet1yKrGlnuLhSmz1HfodOozv 7MNMg0ZGZ57zGnA/+dGIU0Zzgywl38WvJxUvGhaz26n2RfZUajRMRvQAnZJ8Nzg+sFGo Rwe50B9JLdSvpMd0+/NSYO24vMY9pfDUrBPOOL22VTG75LkO7pIPo+pCileKGNO9CK6g MktFGgBf9pcbXa1DfIakvPfgZ1pRHH3W5FiDU/i6PCaRxn5XUlHAsY9Tqap/NnKsPkLV oeig== X-Gm-Message-State: ALoCoQlZ638CeK56jFib+et+U0e5IzC6ME33AgOQDshZIcTNKT0DSnqsDBsn8SNoQXAekyFRlqm6 X-Received: by 10.140.38.167 with SMTP id t36mr20183578qgt.69.1434136245642; Fri, 12 Jun 2015 12:10:45 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPSA id w68sm2071010qge.18.2015.06.12.12.10.45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jun 2015 12:10:45 -0700 (PDT) From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Fri, 12 Jun 2015 12:10:44 -0700 Message-Id: X-Mailer: git-send-email 2.4.3.3.g905f831 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.216.180 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 v2 08/13] 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. Reviewed-by: Peter Maydell Signed-off-by: Peter Crosthwaite --- 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 4a2965f..3f712a6 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -5763,9 +5763,9 @@ do_fault: return true; } -static bool get_phys_addr_mpu(CPUARMState *env, uint32_t address, - int access_type, ARMMMUIdx mmu_idx, - hwaddr *phys_ptr, int *prot, uint32_t *fsr) +static bool get_phys_addr_pmsav5(CPUARMState *env, uint32_t address, + int access_type, ARMMMUIdx mmu_idx, + hwaddr *phys_ptr, int *prot, uint32_t *fsr) { int n; uint32_t mask; @@ -5906,8 +5906,8 @@ static inline bool 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, fsr); + return get_phys_addr_pmsav5(env, address, access_type, mmu_idx, + phys_ptr, prot, fsr); } if (regime_using_lpae_format(env, mmu_idx)) {