diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2022-06-18 17:15:40 -0700 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2022-06-27 11:18:17 +0100 |
| commit | 22536b13247cf041b6dcabf0d708f486058989a9 (patch) | |
| tree | 47fec0d9644bac2eac4e59c13791ede8d3a76278 /hw/arm/virt.c | |
| parent | d61d1b8600caea833c377b31aef61484ccf9e414 (diff) | |
| download | focaccia-qemu-22536b13247cf041b6dcabf0d708f486058989a9.tar.gz focaccia-qemu-22536b13247cf041b6dcabf0d708f486058989a9.zip | |
target/arm: Extend arm_pamax to more than aarch64
Move the code from hw/arm/virt.c that is supposed to handle v7 into the one function. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reported-by: He Zhe <zhe.he@windriver.com> Message-id: 20220619001541.131672-2-richard.henderson@linaro.org Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/virt.c')
| -rw-r--r-- | hw/arm/virt.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 097238faa7..5502aa60c8 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2010,15 +2010,7 @@ static void machvirt_init(MachineState *machine) cpuobj = object_new(possible_cpus->cpus[0].type); armcpu = ARM_CPU(cpuobj); - if (object_property_get_bool(cpuobj, "aarch64", NULL)) { - pa_bits = arm_pamax(armcpu); - } else if (arm_feature(&armcpu->env, ARM_FEATURE_LPAE)) { - /* v7 with LPAE */ - pa_bits = 40; - } else { - /* Anything else */ - pa_bits = 32; - } + pa_bits = arm_pamax(armcpu); object_unref(cpuobj); |