OSDN Git Service

KVM: x86: Simplify kvm_apic_hw_enabled
authorPeng Hao <flyingpeng@tencent.com>
Tue, 6 Dec 2022 09:20:15 +0000 (17:20 +0800)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 23 Dec 2022 17:09:28 +0000 (12:09 -0500)
kvm_apic_hw_enabled() only needs to return bool, there is no place
to use the return value of MSR_IA32_APICBASE_ENABLE.

Signed-off-by: Peng Hao <flyingpeng@tencent.com>
Message-Id: <CAPm50aJ=BLXNWT11+j36Dd6d7nz2JmOBk4u7o_NPQ0N61ODu1g@mail.gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/lapic.h

index 28e3769..58c3242 100644 (file)
@@ -188,11 +188,11 @@ static inline bool lapic_in_kernel(struct kvm_vcpu *vcpu)
 
 extern struct static_key_false_deferred apic_hw_disabled;
 
-static inline int kvm_apic_hw_enabled(struct kvm_lapic *apic)
+static inline bool kvm_apic_hw_enabled(struct kvm_lapic *apic)
 {
        if (static_branch_unlikely(&apic_hw_disabled.key))
                return apic->vcpu->arch.apic_base & MSR_IA32_APICBASE_ENABLE;
-       return MSR_IA32_APICBASE_ENABLE;
+       return true;
 }
 
 extern struct static_key_false_deferred apic_sw_disabled;