From: Philippe Mathieu-Daudé Date: Tue, 21 Jan 2020 11:03:43 +0000 (+0100) Subject: target/arm/kvm: Use CPUState::kvm_state in kvm_arm_pmu_supported() X-Git-Tag: qemu-xen-4.14.0~177^2~32 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d70c996df23f01ee02a661cf085515fc7dac2c5d;p=qemu-xen.git target/arm/kvm: Use CPUState::kvm_state in kvm_arm_pmu_supported() KVMState is already accessible via CPUState::kvm_state, use it. Reviewed-by: Alistair Francis Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20200121110349.25842-5-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- diff --git a/target/arm/kvm.c b/target/arm/kvm.c index b87b59a02a..8d82889150 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)