diff options
| author | Akihiko Odaki <akihiko.odaki@daynix.com> | 2024-07-20 18:30:50 +0900 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2024-07-29 16:02:25 +0100 |
| commit | 0d2aac4ab1777162c7a7ecd5a6d5d4de93842116 (patch) | |
| tree | 0a275712de58e32d1547e6d90151f448500bebe0 /target/arm | |
| parent | 613d0b8ebbf1fa32f8037cb02b7c82f96011ef2d (diff) | |
| download | qemu-0d2aac4ab1777162c7a7ecd5a6d5d4de93842116.zip qemu-0d2aac4ab1777162c7a7ecd5a6d5d4de93842116.tar.gz qemu-0d2aac4ab1777162c7a7ecd5a6d5d4de93842116.tar.bz2 | |
target/arm/kvm: Do not silently remove PMU
kvm_arch_init_vcpu() used to remove PMU when it is not available even
if the CPU model needs one. It is semantically incorrect, and may
continue execution on a misbehaving host that advertises a CPU model
while lacking its PMU. Keep the PMU when the CPU model needs one, and
let kvm_arm_vcpu_init() fail if the KVM implementation mismatches with
our expectation.
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/arm')
| -rw-r--r-- | target/arm/kvm.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/target/arm/kvm.c b/target/arm/kvm.c index b20a350..849e2e2 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -1888,13 +1888,8 @@ int kvm_arch_init_vcpu(CPUState *cs) if (!arm_feature(env, ARM_FEATURE_AARCH64)) { cpu->kvm_init_features[0] |= 1 << KVM_ARM_VCPU_EL1_32BIT; } - if (!kvm_check_extension(cs->kvm_state, KVM_CAP_ARM_PMU_V3)) { - cpu->has_pmu = false; - } if (cpu->has_pmu) { cpu->kvm_init_features[0] |= 1 << KVM_ARM_VCPU_PMU_V3; - } else { - env->features &= ~(1ULL << ARM_FEATURE_PMU); } if (cpu_isar_feature(aa64_sve, cpu)) { assert(kvm_arm_sve_supported()); |