KVM: remove CONFIG_HAVE_KVM_IRQFD

[thirdparty/kernel/stable.git] / arch / x86 / kvm / Kconfig

diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig
index 950c12868d304004ff56e7bc95f7c5f395766a33..b07247b0b958e5c39003ec21fd443aa433520778 100644 (file)
--- a/arch/x86/kvm/Kconfig
+++ b/arch/x86/kvm/Kconfig
@@ -24,16 +24,14 @@ config KVM
        depends on HIGH_RES_TIMERS
        depends on X86_LOCAL_APIC
        select PREEMPT_NOTIFIERS
-       select MMU_NOTIFIER
+       select KVM_GENERIC_MMU_NOTIFIER
        select HAVE_KVM_IRQCHIP
        select HAVE_KVM_PFNCACHE
-       select HAVE_KVM_IRQFD
        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_EVENTFD
        select KVM_ASYNC_PF
        select USER_RETURN_NOTIFIER
        select KVM_MMIO
@@ -77,6 +75,18 @@ config KVM_WERROR
 
          If in doubt, say "N".
 
+config KVM_SW_PROTECTED_VM
+       bool "Enable support for KVM software-protected VMs"
+       depends on EXPERT
+       depends on X86_64
+       select KVM_GENERIC_PRIVATE_MEM
+       help
+         Enable support for KVM software-protected VMs.  Currently "protected"
+         means the VM can be backed with memory provided by
+         KVM_CREATE_GUEST_MEMFD.
+
+         If unsure, say "N".
+
 config KVM_INTEL
        tristate "KVM for Intel (and compatible) processors support"
        depends on KVM && IA32_FEAT_CTL