]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Merge branch 'kvm-kconfig'
authorPaolo Bonzini <pbonzini@redhat.com>
Thu, 8 Feb 2024 13:47:06 +0000 (08:47 -0500)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 8 Feb 2024 13:47:51 +0000 (08:47 -0500)
Cleanups to Kconfig definitions for KVM

* replace HAVE_KVM with an architecture-dependent symbol, when CONFIG_KVM
  may or may not be available depending on CPU capabilities (MIPS)

* replace HAVE_KVM with IS_ENABLED(CONFIG_KVM) for host-side code that is
  not part of the KVM module, so that it is completely compiled out

* factor common "select" statements in common code instead of requiring
  each architecture to specify it

1  2 
arch/arm64/kvm/Kconfig
arch/loongarch/kvm/Kconfig
arch/mips/kvm/Kconfig
arch/x86/kvm/Kconfig
virt/kvm/Kconfig

index 114626b816f7e1ac39d2cc6d8c165d87721d5394,99193d3b8312afa971754fc1a7b9b759d42321b7..01398d2996c731a7d074436e8994953d454e71b5
@@@ -34,9 -33,7 +33,8 @@@ menuconfig KV
        select HAVE_KVM_MSI
        select HAVE_KVM_IRQCHIP
        select HAVE_KVM_IRQ_ROUTING
-       select IRQ_BYPASS_MANAGER
        select HAVE_KVM_IRQ_BYPASS
 +      select HAVE_KVM_READONLY_MEM
        select HAVE_KVM_VCPU_RUN_PID_CHANGE
        select SCHED_INFO
        select GUEST_PERF_EVENTS if PERF_EVENTS
Simple merge
Simple merge
index 5895aee5dfefe71d07d25d818a93cea8d1ba37fa,5692393b75659ebb4ca65a2214a755d91940e2bb..d43efae05794f649b33b7b35badc354685bab0fc
@@@ -29,10 -27,8 +27,9 @@@ config KV
        select HAVE_KVM_PFNCACHE
        select HAVE_KVM_DIRTY_RING_TSO
        select HAVE_KVM_DIRTY_RING_ACQ_REL
-       select IRQ_BYPASS_MANAGER
        select HAVE_KVM_IRQ_BYPASS
        select HAVE_KVM_IRQ_ROUTING
 +      select HAVE_KVM_READONLY_MEM
        select KVM_ASYNC_PF
        select USER_RETURN_NOTIFIER
        select KVM_MMIO
Simple merge