Commit 0da029ed authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86: rename quirk constants to KVM_X86_QUIRK_* 



Make them clearly architecture-dependent; the capability is valid for
all architectures, but the argument is not.

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

arch/x86/include/uapi/asm/kvm.h

+2 −2
Original line number Diff line number Diff line
@@ -354,7 +354,7 @@ struct kvm_xcrs { 
struct kvm_sync_regs {

};



#define KVM_QUIRK_LINT0_REENABLED	(1 << 0)

#define KVM_QUIRK_CD_NW_CLEARED		(1 << 1)

#define KVM_X86_QUIRK_LINT0_REENABLED	(1 << 0)

#define KVM_X86_QUIRK_CD_NW_CLEARED	(1 << 1)



#endif /* _ASM_X86_KVM_H */

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 (kvm_check_has_quirk(vcpu->kvm, KVM_QUIRK_LINT0_REENABLED))

	if (kvm_check_has_quirk(vcpu->kvm, KVM_X86_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 (kvm_check_has_quirk(vcpu->kvm, KVM_QUIRK_CD_NW_CLEARED))

	if (kvm_check_has_quirk(vcpu->kvm, KVM_X86_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/vmx.c

+1 −1
Original line number Diff line number Diff line
@@ -8650,7 +8650,7 @@ static u64 vmx_get_mt_mask(struct kvm_vcpu *vcpu, gfn_t gfn, bool is_mmio) 


	if (kvm_read_cr0(vcpu) & X86_CR0_CD) {

		ipat = VMX_EPT_IPAT_BIT;

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

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

			cache = MTRR_TYPE_WRBACK;

		else

			cache = MTRR_TYPE_UNCACHABLE;