Move apicv_active into struct kvm_lapic; KVM enables APICv if and only if a VM/vCPU has an in-kernel APIC. This was posted a while back as a one-off patch in an APICv cleanup[*]. The idea and most of the changes remain the same, though I eked out a few more cleanups. [*] https://lore.kernel.org/all/20211022004927.1448382-4-seanjc@xxxxxxxxxx/ Sean Christopherson (5): KVM: SVM: Drop unused AVIC / kvm_x86_ops declarations KVM: x86: Drop @vcpu parameter from kvm_x86_ops.hwapic_isr_update() KVM: x86: Check for in-kernel xAPIC when querying APICv for directed yield KVM: x86: Move "apicv_active" into "struct kvm_lapic" KVM: x86: Use lapic_in_kernel() to query in-kernel APIC in APICv helper arch/x86/include/asm/kvm_host.h | 3 +-- arch/x86/kvm/lapic.c | 38 ++++++++++++--------------------- arch/x86/kvm/lapic.h | 3 ++- arch/x86/kvm/svm/svm.c | 5 +++-- arch/x86/kvm/svm/svm.h | 4 ---- arch/x86/kvm/vmx/vmx.c | 5 +++-- arch/x86/kvm/x86.c | 14 ++++++------ 7 files changed, 31 insertions(+), 41 deletions(-) base-commit: 8baacf67c76c560fed954ac972b63e6e59a6fba0 -- 2.36.1.476.g0c4daa206d-goog