[PULL,26/59] target/arm/kvm: Use CPUState::kvm_state in kvm_arm_pmu_supported()

Commit Message

Paolo Bonzini Jan. 23, 2020, 1:48 p.m. UTC

From: Philippe Mathieu-Daudé <[e-mail]>

KVMState is already accessible via CPUState::kvm_state, use it.

Reviewed-by: Alistair Francis <[e-mail]>
Signed-off-by: Philippe Mathieu-Daudé <[e-mail]>
Message-Id: <[e-mail]>
Signed-off-by: Paolo Bonzini <[e-mail]>
---
 target/arm/kvm.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Patch

diff --git a/target/arm/kvm.c b/target/arm/kvm.c
index b87b59a..8d82889 100644
--- a/target/arm/kvm.c
+++ b/target/arm/kvm.c
@@ -181,9 +181,7 @@  void kvm_arm_set_cpu_features_from_host(ARMCPU *cpu)
 
 bool kvm_arm_pmu_supported(CPUState *cpu)
 {
-    KVMState *s = KVM_STATE(current_machine->accelerator);
-
-    return kvm_check_extension(s, KVM_CAP_ARM_PMU_V3);
+    return kvm_check_extension(cpu->kvm_state, KVM_CAP_ARM_PMU_V3);
 }
 
 int kvm_arm_get_max_vm_ipa_size(MachineState *ms)