Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Paolo Bonzini <pbonzini@redhat.com>

+5 -5
+2 -2
arch/x86/include/uapi/asm/kvm.h
··· 354 354 struct kvm_sync_regs { 355 355 }; 356 356 357 - #define KVM_QUIRK_LINT0_REENABLED (1 << 0) 358 - #define KVM_QUIRK_CD_NW_CLEARED (1 << 1) 357 + #define KVM_X86_QUIRK_LINT0_REENABLED (1 << 0) 358 + #define KVM_X86_QUIRK_CD_NW_CLEARED (1 << 1) 359 359 360 360 #endif /* _ASM_X86_KVM_H */
+1 -1
arch/x86/kvm/lapic.c
··· 1595 1595 for (i = 0; i < APIC_LVT_NUM; i++) 1596 1596 apic_set_reg(apic, APIC_LVTT + 0x10 * i, APIC_LVT_MASKED); 1597 1597 apic_update_lvtt(apic); 1598 - if (kvm_check_has_quirk(vcpu->kvm, KVM_QUIRK_LINT0_REENABLED)) 1598 + if (kvm_check_has_quirk(vcpu->kvm, KVM_X86_QUIRK_LINT0_REENABLED)) 1599 1599 apic_set_reg(apic, APIC_LVT0, 1600 1600 SET_APIC_DELIVERY_MODE(0, APIC_MODE_EXTINT)); 1601 1601 apic_manage_nmi_watchdog(apic, kvm_apic_get_reg(apic, APIC_LVT0));
+1 -1
arch/x86/kvm/svm.c
··· 1672 1672 * does not do it - this results in some delay at 1673 1673 * reboot 1674 1674 */ 1675 - if (kvm_check_has_quirk(vcpu->kvm, KVM_QUIRK_CD_NW_CLEARED)) 1675 + if (kvm_check_has_quirk(vcpu->kvm, KVM_X86_QUIRK_CD_NW_CLEARED)) 1676 1676 cr0 &= ~(X86_CR0_CD | X86_CR0_NW); 1677 1677 svm->vmcb->save.cr0 = cr0; 1678 1678 mark_dirty(svm->vmcb, VMCB_CR);
+1 -1
arch/x86/kvm/vmx.c
··· 8650 8650 8651 8651 if (kvm_read_cr0(vcpu) & X86_CR0_CD) { 8652 8652 ipat = VMX_EPT_IPAT_BIT; 8653 - if (kvm_check_has_quirk(vcpu->kvm, KVM_QUIRK_CD_NW_CLEARED)) 8653 + if (kvm_check_has_quirk(vcpu->kvm, KVM_X86_QUIRK_CD_NW_CLEARED)) 8654 8654 cache = MTRR_TYPE_WRBACK; 8655 8655 else 8656 8656 cache = MTRR_TYPE_UNCACHABLE;