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/kvm/irq.c | |
| parent | fb872da8e720f8281dde01b8929419eb5ae6b033 (diff) | |
| parent | 017a99a966f1183e611f0b0fa6bec40160c81813 (diff) | |
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/kvm/irq.c')
| -rw-r--r-- | arch/x86/kvm/irq.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kvm/irq.c b/arch/x86/kvm/irq.c index b2c397dd2bc6..ad9ca8a60144 100644 --- a/arch/x86/kvm/irq.c +++ b/arch/x86/kvm/irq.c @@ -118,8 +118,10 @@ static int kvm_cpu_get_extint(struct kvm_vcpu *v) if (!lapic_in_kernel(v)) return v->arch.interrupt.nr; +#ifdef CONFIG_KVM_XEN if (kvm_xen_has_interrupt(v)) return v->kvm->arch.xen.upcall_vector; +#endif if (irqchip_split(v->kvm)) { int vector = v->arch.pending_external_vector; |