These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / x86 / kvm / Kconfig

diff --git a/kernel/arch/x86/kvm/Kconfig b/kernel/arch/x86/kvm/Kconfig
index 413a7bf..639a6e3 100644 (file)
--- a/kernel/arch/x86/kvm/Kconfig
+++ b/kernel/arch/x86/kvm/Kconfig
@@ -28,6 +28,8 @@ config KVM
        select ANON_INODES
        select HAVE_KVM_IRQCHIP
        select HAVE_KVM_IRQFD
+       select IRQ_BYPASS_MANAGER
+       select HAVE_KVM_IRQ_BYPASS
        select HAVE_KVM_IRQ_ROUTING
        select HAVE_KVM_EVENTFD
        select KVM_APIC_ARCHITECTURE
@@ -86,15 +88,16 @@ config KVM_MMU_AUDIT
         auditing of KVM MMU events at runtime.
 
 config KVM_DEVICE_ASSIGNMENT
-       bool "KVM legacy PCI device assignment support"
+       bool "KVM legacy PCI device assignment support (DEPRECATED)"
        depends on KVM && PCI && IOMMU_API
-       default y
+       default n
        ---help---
          Provide support for legacy PCI device assignment through KVM.  The
          kernel now also supports a full featured userspace device driver
-         framework through VFIO, which supersedes much of this support.
+         framework through VFIO, which supersedes this support and provides
+         better security.
 
-         If unsure, say Y.
+         If unsure, say N.
 
 # OK, it's a little counter-intuitive to do this, but it puts it neatly under
 # the virtualization menu.