diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2023-02-15 20:23:19 +0300 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-02-15 20:23:19 +0300 |
commit | 27b025ebb0f6092d5c0a88de2ab73545bc1c496e (patch) | |
tree | 57d0a771cc8c55555b1dc8af7668b3075615ca7f /arch/x86/kvm/x86.h | |
parent | 4bc6dcaa159b77ecc2c0c657433c3f5c8a657711 (diff) | |
parent | 93827a0a36396f2fd6368a54a020f420c8916e9b (diff) | |
download | linux-27b025ebb0f6092d5c0a88de2ab73545bc1c496e.tar.xz |
Merge tag 'kvm-x86-vmx-6.3' of https://github.com/kvm-x86/linux into HEAD
KVM VMX changes for 6.3:
- Handle NMI VM-Exits before leaving the noinstr region
- A few trivial cleanups in the VM-Enter flows
- Stop enabling VMFUNC for L1 purely to document that KVM doesn't support
EPTP switching (or any other VM function) for L1
- Fix a crash when using eVMCS's enlighted MSR bitmaps
Diffstat (limited to 'arch/x86/kvm/x86.h')
-rw-r--r-- | arch/x86/kvm/x86.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h index f3554bf05201..a8167b47b8c8 100644 --- a/arch/x86/kvm/x86.h +++ b/arch/x86/kvm/x86.h @@ -394,13 +394,13 @@ enum kvm_intr_type { KVM_HANDLING_NMI, }; -static inline void kvm_before_interrupt(struct kvm_vcpu *vcpu, - enum kvm_intr_type intr) +static __always_inline void kvm_before_interrupt(struct kvm_vcpu *vcpu, + enum kvm_intr_type intr) { WRITE_ONCE(vcpu->arch.handling_intr_from_guest, (u8)intr); } -static inline void kvm_after_interrupt(struct kvm_vcpu *vcpu) +static __always_inline void kvm_after_interrupt(struct kvm_vcpu *vcpu) { WRITE_ONCE(vcpu->arch.handling_intr_from_guest, 0); } |