Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> --- target/arm/kvm32.c | 10 +++++----- target/arm/kvm64.c | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/target/arm/kvm32.c b/target/arm/kvm32.c index f271181ab8..0ab28b473a 100644 --- a/target/arm/kvm32.c +++ b/target/arm/kvm32.c @@ -22,7 +22,7 @@ #include "internals.h" #include "qemu/log.h" -static inline void set_feature(uint64_t *features, int feature) +static inline void kvm_set_feature(uint64_t *features, int feature) { *features |= 1ULL << feature; } @@ -146,14 +146,14 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) * timers; this in turn implies most of the other feature * bits, but a few must be tested. */ - set_feature(&features, ARM_FEATURE_V7VE); - set_feature(&features, ARM_FEATURE_GENERIC_TIMER); + kvm_set_feature(&features, ARM_FEATURE_V7VE); + kvm_set_feature(&features, ARM_FEATURE_GENERIC_TIMER); if (extract32(id_pfr0, 12, 4) == 1) { - set_feature(&features, ARM_FEATURE_THUMB2EE); + kvm_set_feature(&features, ARM_FEATURE_THUMB2EE); } if (extract32(ahcf->isar.mvfr1, 12, 4) == 1) { - set_feature(&features, ARM_FEATURE_NEON); + kvm_set_feature(&features, ARM_FEATURE_NEON); } ahcf->features = features; diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c index be5b31c2b0..ad33e048e4 100644 --- a/target/arm/kvm64.c +++ b/target/arm/kvm64.c @@ -447,12 +447,12 @@ void kvm_arm_pmu_set_irq(CPUState *cs, int irq) } } -static inline void set_feature(uint64_t *features, int feature) +static inline void kvm_set_feature(uint64_t *features, int feature) { *features |= 1ULL << feature; } -static inline void unset_feature(uint64_t *features, int feature) +static inline void kvm_unset_feature(uint64_t *features, int feature) { *features &= ~(1ULL << feature); } @@ -648,11 +648,11 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) * with VFPv4+Neon; this in turn implies most of the other * feature bits. */ - set_feature(&features, ARM_FEATURE_V8); - set_feature(&features, ARM_FEATURE_NEON); - set_feature(&features, ARM_FEATURE_AARCH64); - set_feature(&features, ARM_FEATURE_PMU); - set_feature(&features, ARM_FEATURE_GENERIC_TIMER); + kvm_set_feature(&features, ARM_FEATURE_V8); + kvm_set_feature(&features, ARM_FEATURE_NEON); + kvm_set_feature(&features, ARM_FEATURE_AARCH64); + kvm_set_feature(&features, ARM_FEATURE_PMU); + kvm_set_feature(&features, ARM_FEATURE_GENERIC_TIMER); ahcf->features = features; @@ -802,7 +802,7 @@ int kvm_arch_init_vcpu(CPUState *cs) if (cpu->has_pmu) { cpu->kvm_init_features[0] |= 1 << KVM_ARM_VCPU_PMU_V3; } else { - unset_feature(&env->features, ARM_FEATURE_PMU); + kvm_unset_feature(&env->features, ARM_FEATURE_PMU); } if (cpu_isar_feature(aa64_sve, cpu)) { assert(kvm_arm_sve_supported(cs)); -- 2.21.1