From 71f370d5493ad8e47d65fa0e3a465e18671f330a Mon Sep 17 00:00:00 2001 From: "Edgar E. Iglesias" Date: Mon, 19 Feb 2018 01:16:06 -0500 Subject: [PATCH] target-arm: Rename check_s2_startlevel to check_s2_mmu_setup Rename check_s2_startlevel to check_s2_mmu_setup in preparation for additional checks. Backports commit a0e966c93a0968d29ef51447d08a6b7be6f4d757 from qemu --- qemu/target-arm/helper.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/qemu/target-arm/helper.c b/qemu/target-arm/helper.c index 5eb1b18a..37b37fe1 100644 --- a/qemu/target-arm/helper.c +++ b/qemu/target-arm/helper.c @@ -6110,17 +6110,18 @@ typedef enum { } MMUFaultType; /* - * check_s2_startlevel + * check_s2_mmu_setup * @cpu: ARMCPU * @is_aa64: True if the translation regime is in AArch64 state * @startlevel: Suggested starting level * @inputsize: Bitsize of IPAs * @stride: Page-table stride (See the ARM ARM) * - * Returns true if the suggested starting level is OK and false otherwise. + * Returns true if the suggested S2 translation parameters are OK and + * false otherwise. */ -static bool check_s2_startlevel(ARMCPU *cpu, bool is_aa64, int level, - int inputsize, int stride) +static bool check_s2_mmu_setup(ARMCPU *cpu, bool is_aa64, int level, + int inputsize, int stride) { const int grainsize = stride + 3; int startsizecheck; @@ -6360,8 +6361,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address, } /* Check that the starting level is valid. */ - ok = check_s2_startlevel(cpu, va_size == 64, level, - inputsize, stride); + ok = check_s2_mmu_setup(cpu, va_size == 64, level, inputsize, stride); if (!ok) { /* AArch64 reports these as level 0 faults. * AArch32 reports these as level 1 faults.