From: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu, 8 Feb 2024 13:47:06 +0000 (-0500)
Subject: Merge branch 'kvm-kconfig'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=687d8f4c3dea0758afd748968d91288220bbe7e3;p=linux.git

Merge branch 'kvm-kconfig'

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
---

687d8f4c3dea0758afd748968d91288220bbe7e3
diff --cc arch/arm64/kvm/Kconfig
index 114626b816f7e,99193d3b8312a..01398d2996c73
--- a/arch/arm64/kvm/Kconfig
+++ b/arch/arm64/kvm/Kconfig
@@@ -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
diff --cc arch/x86/kvm/Kconfig
index 5895aee5dfefe,5692393b75659..d43efae05794f
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@@@ -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