Commit 565b7820 authored by Xiaoyao Li's avatar Xiaoyao Li Committed by Paolo Bonzini
Browse files

KVM: lapic: Use guest_cpuid_has() in kvm_apic_set_version() 



Only code cleanup and no functional change.

Signed-off-by: default avatarXiaoyao Li <xiaoyao.li@intel.com>
Message-Id: <20200708065054.19713-8-xiaoyao.li@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 0d3b2ba1

arch/x86/kvm/lapic.c

+1 −3
Original line number Diff line number Diff line
@@ -354,7 +354,6 @@ static inline int apic_lvt_nmi_mode(u32 lvt_val) 
void kvm_apic_set_version(struct kvm_vcpu *vcpu)

{

	struct kvm_lapic *apic = vcpu->arch.apic;

	struct kvm_cpuid_entry2 *feat;

	u32 v = APIC_VERSION;



	if (!lapic_in_kernel(vcpu))
@@ -367,8 +366,7 @@ void kvm_apic_set_version(struct kvm_vcpu *vcpu) 
	 * version first and level-triggered interrupts never get EOIed in

	 * IOAPIC.

	 */

	feat = kvm_find_cpuid_entry(apic->vcpu, 0x1, 0);

	if (feat && (feat->ecx & (1 << (X86_FEATURE_X2APIC & 31))) &&

	if (guest_cpuid_has(vcpu, X86_FEATURE_X2APIC) &&

	    !ioapic_in_kernel(vcpu->kvm))

		v |= APIC_LVR_DIRECTED_EOI;

	kvm_lapic_set_reg(apic, APIC_LVR, v);