diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-01-08 08:10:01 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-01-08 08:10:01 -0500 |
| commit | 0afdfd85e33afdbda4cdd219c22ee5bf95b005f4 (patch) | |
| tree | 1f1bbae0e13a80cad8cd87595cbf3c67b966259a /arch/x86/include/asm/kvm-x86-ops.h | |
| parent | fb872da8e720f8281dde01b8929419eb5ae6b033 (diff) | |
| parent | 017a99a966f1183e611f0b0fa6bec40160c81813 (diff) | |
| download | linux-0afdfd85e33afdbda4cdd219c22ee5bf95b005f4.tar.gz linux-0afdfd85e33afdbda4cdd219c22ee5bf95b005f4.tar.bz2 linux-0afdfd85e33afdbda4cdd219c22ee5bf95b005f4.zip | |
Merge tag 'kvm-x86-hyperv-6.8' of https://github.com/kvm-x86/linux into HEAD
KVM x86 Hyper-V changes for 6.8:
- Guard KVM-on-HyperV's range-based TLB flush hooks with an #ifdef on
CONFIG_HYPERV as a minor optimization, and to self-document the code.
- Add CONFIG_KVM_HYPERV to allow disabling KVM support for HyperV "emulation"
at build time.
Diffstat (limited to 'arch/x86/include/asm/kvm-x86-ops.h')
| -rw-r--r-- | arch/x86/include/asm/kvm-x86-ops.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/kvm-x86-ops.h b/arch/x86/include/asm/kvm-x86-ops.h index 26b628d84594..f482216bbdb8 100644 --- a/arch/x86/include/asm/kvm-x86-ops.h +++ b/arch/x86/include/asm/kvm-x86-ops.h @@ -55,8 +55,10 @@ KVM_X86_OP(set_rflags) KVM_X86_OP(get_if_flag) KVM_X86_OP(flush_tlb_all) KVM_X86_OP(flush_tlb_current) +#if IS_ENABLED(CONFIG_HYPERV) KVM_X86_OP_OPTIONAL(flush_remote_tlbs) KVM_X86_OP_OPTIONAL(flush_remote_tlbs_range) +#endif KVM_X86_OP(flush_tlb_gva) KVM_X86_OP(flush_tlb_guest) KVM_X86_OP(vcpu_pre_run) |