target/arm: Unindent unnecessary else-clause

Now that the if() branch of the condition in aarch64_max_initfn()
returns early, we don't need to keep the rest of the code in
the function inside an else block. Remove the else, unindenting
that code.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Alexander Graf <agraf@csgraf.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220204165506.2846058-5-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2022-02-04 16:55:04 +00:00
parent 0baa21be49
commit ddaebdda53
1 changed files with 146 additions and 143 deletions

View File

@ -707,14 +707,17 @@ static void aarch64_host_initfn(Object *obj)
static void aarch64_max_initfn(Object *obj) static void aarch64_max_initfn(Object *obj)
{ {
ARMCPU *cpu = ARM_CPU(obj); ARMCPU *cpu = ARM_CPU(obj);
uint64_t t;
uint32_t u;
if (kvm_enabled()) { if (kvm_enabled()) {
/* With KVM, '-cpu max' is identical to '-cpu host' */ /* With KVM, '-cpu max' is identical to '-cpu host' */
aarch64_host_initfn(obj); aarch64_host_initfn(obj);
return; return;
} else { }
uint64_t t;
uint32_t u; /* '-cpu max' for TCG: we currently do this as "A57 with extra things" */
aarch64_a57_initfn(obj); aarch64_a57_initfn(obj);
/* /*
@ -868,7 +871,8 @@ static void aarch64_max_initfn(Object *obj)
cpu->isar.mvfr1 = u; cpu->isar.mvfr1 = u;
#ifdef CONFIG_USER_ONLY #ifdef CONFIG_USER_ONLY
/* For usermode -cpu max we can use a larger and more efficient DCZ /*
* For usermode -cpu max we can use a larger and more efficient DCZ
* blocksize since we don't have to follow what the hardware does. * blocksize since we don't have to follow what the hardware does.
*/ */
cpu->ctr = 0x80038003; /* 32 byte I and D cacheline size, VIPT icache */ cpu->ctr = 0x80038003; /* 32 byte I and D cacheline size, VIPT icache */
@ -876,7 +880,6 @@ static void aarch64_max_initfn(Object *obj)
#endif #endif
bitmap_fill(cpu->sve_vq_supported, ARM_MAX_VQ); bitmap_fill(cpu->sve_vq_supported, ARM_MAX_VQ);
}
aarch64_add_pauth_properties(obj); aarch64_add_pauth_properties(obj);
aarch64_add_sve_properties(obj); aarch64_add_sve_properties(obj);