Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41dbc6bc authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86: introduce kvm_check_has_quirk 



The logic of the disabled_quirks field usually results in a double
negation.  Wrap it in a simple function that checks the bit and
negates it.

Based on a patch from Xiao Guangrong.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3e5d2fdc

arch/x86/kvm/lapic.c

+1 −1
Original line number Diff line number Diff line
@@ -1595,7 +1595,7 @@ void kvm_lapic_reset(struct kvm_vcpu *vcpu, bool init_event) 
	for (i = 0; i < APIC_LVT_NUM; i++)

		apic_set_reg(apic, APIC_LVTT + 0x10 * i, APIC_LVT_MASKED);

	apic_update_lvtt(apic);

	if (!(vcpu->kvm->arch.disabled_quirks & KVM_QUIRK_LINT0_REENABLED))

	if (kvm_check_has_quirk(vcpu->kvm, KVM_QUIRK_LINT0_REENABLED))

		apic_set_reg(apic, APIC_LVT0,

			     SET_APIC_DELIVERY_MODE(0, APIC_MODE_EXTINT));

	apic_manage_nmi_watchdog(apic, kvm_apic_get_reg(apic, APIC_LVT0));

arch/x86/kvm/svm.c

+1 −1
Original line number Diff line number Diff line
@@ -1672,7 +1672,7 @@ static void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0) 
	 * does not do it - this results in some delay at

	 * reboot

	 */

	if (!(vcpu->kvm->arch.disabled_quirks & KVM_QUIRK_CD_NW_CLEARED))

	if (kvm_check_has_quirk(vcpu->kvm, KVM_QUIRK_CD_NW_CLEARED))

		cr0 &= ~(X86_CR0_CD | X86_CR0_NW);

	svm->vmcb->save.cr0 = cr0;

	mark_dirty(svm->vmcb, VMCB_CR);

arch/x86/kvm/x86.h

+5 −0
Original line number Diff line number Diff line
@@ -147,6 +147,11 @@ static inline void kvm_register_writel(struct kvm_vcpu *vcpu, 
	return kvm_register_write(vcpu, reg, val);

}



static inline bool kvm_check_has_quirk(struct kvm *kvm, u64 quirk)

{

	return !(kvm->arch.disabled_quirks & quirk);

}



void kvm_before_handle_nmi(struct kvm_vcpu *vcpu);

void kvm_after_handle_nmi(struct kvm_vcpu *vcpu);

void kvm_set_pending_timer(struct kvm_vcpu *vcpu);