[RFC,v4,30/33] target/arm: remove broad "else" statements when checking accels

There might be more than just KVM and TCG in the future,
so where appropriate, replace broad "else" statements
with the appropriate if (accel_enabled()) check.

Also invert some checks for !kvm_enabled() or !tcg_enabled()
where it seems appropriate to do so.

Note that to make qtest happy we need to perform gpio
initialization in the qtest_enabled() case as well.

Signed-off-by: Claudio Fontana <cfontana@suse.de>
---
 target/arm/cpu.c     | 10 ++++++----
 target/arm/cpu64.c   | 13 +++++++++----
 target/arm/machine.c | 19 ++++++-------------
 3 files changed, 21 insertions(+), 21 deletions(-)

Cc'ing Xen list

On 3/5/21 3:59 PM, Claudio Fontana wrote:
> There might be more than just KVM and TCG in the future,
> so where appropriate, replace broad "else" statements
> with the appropriate if (accel_enabled()) check.
> 
> Also invert some checks for !kvm_enabled() or !tcg_enabled()
> where it seems appropriate to do so.
> 
> Note that to make qtest happy we need to perform gpio
> initialization in the qtest_enabled() case as well.
> 
> Signed-off-by: Claudio Fontana <cfontana@suse.de>
> ---
>  target/arm/cpu.c     | 10 ++++++----
>  target/arm/cpu64.c   | 13 +++++++++----
>  target/arm/machine.c | 19 ++++++-------------
>  3 files changed, 21 insertions(+), 21 deletions(-)
> 
> diff --git a/target/arm/cpu.c b/target/arm/cpu.c
> index be86bd4b8b..353cd652bc 100644
> --- a/target/arm/cpu.c
> +++ b/target/arm/cpu.c
> @@ -37,6 +37,7 @@
>  #endif
>  
>  #include "sysemu/tcg.h"
> +#include "sysemu/qtest.h"
>  #include "kvm/kvm_arm.h"
>  #include "disas/capstone.h"
>  #include "fpu/softfloat.h"
> @@ -564,7 +565,8 @@ static void arm_cpu_initfn(Object *obj)
>           * the same interface as non-KVM CPUs.
>           */
>          qdev_init_gpio_in(DEVICE(cpu), arm_cpu_kvm_set_irq, 4);
> -    } else {
> +    }
> +    if (tcg_enabled() || qtest_enabled()) {
>          qdev_init_gpio_in(DEVICE(cpu), arm_cpu_set_irq, 4);
>      }
>  
> @@ -741,14 +743,14 @@ void arm_cpu_post_init(Object *obj)
>          ? cpu_isar_feature(aa64_fp_simd, cpu)
>          : cpu_isar_feature(aa32_vfp, cpu)) {
>          cpu->has_vfp = true;
> -        if (!kvm_enabled()) {
> +        if (tcg_enabled()) {
>              qdev_property_add_static(DEVICE(obj), &arm_cpu_has_vfp_property);
>          }
>      }
>  
>      if (arm_feature(&cpu->env, ARM_FEATURE_NEON)) {
>          cpu->has_neon = true;
> -        if (!kvm_enabled()) {
> +        if (tcg_enabled()) {
>              qdev_property_add_static(DEVICE(obj), &arm_cpu_has_neon_property);
>          }
>      }
> @@ -849,7 +851,7 @@ void arm_cpu_finalize_features(ARMCPU *cpu, Error **errp)
>           * We have not registered the cpu properties when KVM
>           * is in use, so the user will not be able to set them.
>           */
> -        if (!kvm_enabled()) {
> +        if (tcg_enabled()) {
>              arm_cpu_pauth_finalize(cpu, &local_err);
>              if (local_err != NULL) {
>                  error_propagate(errp, local_err);
> diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
> index 7c27b0febb..be3c1c6f36 100644
> --- a/target/arm/cpu64.c
> +++ b/target/arm/cpu64.c
> @@ -23,6 +23,7 @@
>  #include "qemu/qemu-print.h"
>  #include "cpu.h"
>  #include "qemu/module.h"
> +#include "sysemu/tcg.h"
>  #include "sysemu/kvm.h"
>  #include "kvm/kvm_arm.h"
>  #include "qapi/visitor.h"
> @@ -296,7 +297,8 @@ void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp)
>               */
>              bitmap_andnot(tmp, kvm_supported, cpu->sve_vq_init, max_vq);
>              bitmap_or(cpu->sve_vq_map, cpu->sve_vq_map, tmp, max_vq);
> -        } else {
> +        }
> +        if (tcg_enabled()) {
>              /* Propagate enabled bits down through required powers-of-two. */
>              for (vq = pow2floor(max_vq); vq >= 1; vq >>= 1) {
>                  if (!test_bit(vq - 1, cpu->sve_vq_init)) {
> @@ -333,7 +335,8 @@ void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp)
>                                    "vector length must be enabled.\n");
>                  return;
>              }
> -        } else {
> +        }
> +        if (tcg_enabled()) {
>              /* Disabling a power-of-two disables all larger lengths. */
>              if (test_bit(0, cpu->sve_vq_init)) {
>                  error_setg(errp, "cannot disable sve128");
> @@ -415,7 +418,8 @@ void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp)
>              }
>              return;
>          }
> -    } else {
> +    }
> +    if (tcg_enabled()) {
>          /* Ensure all required powers-of-two are enabled. */
>          for (vq = pow2floor(max_vq); vq >= 1; vq >>= 1) {
>              if (!test_bit(vq - 1, cpu->sve_vq_map)) {
> @@ -609,7 +613,8 @@ static void aarch64_max_initfn(Object *obj)
>  
>      if (kvm_enabled()) {
>          kvm_arm_set_cpu_features_from_host(cpu);
> -    } else {
> +    }
> +    if (tcg_enabled()) {
>          uint64_t t;
>          uint32_t u;
>          aarch64_a57_initfn(obj);
> diff --git a/target/arm/machine.c b/target/arm/machine.c
> index 595ab94237..cfc2bb4982 100644
> --- a/target/arm/machine.c
> +++ b/target/arm/machine.c
> @@ -638,24 +638,21 @@ static int cpu_pre_save(void *opaque)
>  
>      if (tcg_enabled()) {
>          pmu_op_start(&cpu->env);
> +        if (!write_cpustate_to_list(cpu, false)) {
> +            /* This should never fail. */
> +            abort();
> +        }
>      }
> -
>      if (kvm_enabled()) {
>          if (!write_kvmstate_to_list(cpu)) {
>              /* This should never fail */
>              abort();
>          }
> -
>          /*
>           * kvm_arm_cpu_pre_save() must be called after
>           * write_kvmstate_to_list()
>           */
>          kvm_arm_cpu_pre_save(cpu);
> -    } else {
> -        if (!write_cpustate_to_list(cpu, false)) {
> -            /* This should never fail. */
> -            abort();
> -        }
>      }
>  
>      cpu->cpreg_vmstate_array_len = cpu->cpreg_array_len;
> @@ -754,20 +751,16 @@ static int cpu_post_load(void *opaque, int version_id)
>           */
>          write_list_to_cpustate(cpu);
>          kvm_arm_cpu_post_load(cpu);
> -    } else {
> +    }
> +    if (tcg_enabled()) {
>          if (!write_list_to_cpustate(cpu)) {
>              return -1;
>          }
> -    }
> -
> -    if (tcg_enabled()) {
>          hw_breakpoint_update_all(cpu);
>          hw_watchpoint_update_all(cpu);
> -
>          pmu_op_finish(&cpu->env);
>          arm_rebuild_hflags(&cpu->env);
>      }
> -
>      return 0;
>  }
>  
>