]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
Merge tag 'kvm-x86-xen-6.7' of https://github.com/kvm-x86/linux into HEAD
authorPaolo Bonzini <pbonzini@redhat.com>
Tue, 31 Oct 2023 14:21:42 +0000 (10:21 -0400)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 31 Oct 2023 14:21:42 +0000 (10:21 -0400)
commite122d7a1008769af080b9dbd78fce54d3cd77f6f
tree0979e8a58cb2efb167528de367f908786c7bb091
parentf0f59d069e0a33bd43afe664e16b4a86cf9d079c
parent409f2e92a27a210fc768c5569851b4a419e6a232
Merge tag 'kvm-x86-xen-6.7' of https://github.com/kvm-x86/linux into HEAD

KVM x86 Xen changes for 6.7:

 - Omit "struct kvm_vcpu_xen" entirely when CONFIG_KVM_XEN=n.

 - Use the fast path directly from the timer callback when delivering Xen timer
   events.  Avoid the problematic races with using the fast path by ensuring
   the hrtimer isn't running when (re)starting the timer or saving the timer
   information (for userspace).

 - Follow the lead of upstream Xen and ignore the VCPU_SSHOTTMR_future flag.
arch/x86/include/asm/kvm_host.h
arch/x86/kvm/cpuid.c
arch/x86/kvm/x86.c
arch/x86/kvm/xen.c