diff options
Diffstat (limited to 'arch/s390/kvm/Kconfig')
| -rw-r--r-- | arch/s390/kvm/Kconfig | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig index e051cad1f1e..10d529ac982 100644 --- a/arch/s390/kvm/Kconfig +++ b/arch/s390/kvm/Kconfig @@ -1,12 +1,11 @@ # # KVM configuration # -config HAVE_KVM - bool +source "virt/kvm/Kconfig" menuconfig VIRTUALIZATION - bool "Virtualization" - default y + def_bool y + prompt "KVM" ---help--- Say Y here to get to see options for using your Linux host to run other operating systems inside virtual machines (guests). @@ -17,11 +16,17 @@ menuconfig VIRTUALIZATION if VIRTUALIZATION config KVM - tristate "Kernel-based Virtual Machine (KVM) support" - depends on HAVE_KVM && EXPERIMENTAL + def_tristate y + prompt "Kernel-based Virtual Machine (KVM) support" + depends on HAVE_KVM select PREEMPT_NOTIFIERS select ANON_INODES - select S390_SWITCH_AMODE + select HAVE_KVM_CPU_RELAX_INTERCEPT + select HAVE_KVM_EVENTFD + select KVM_ASYNC_PF + select KVM_ASYNC_PF_SYNC + select HAVE_KVM_IRQCHIP + select HAVE_KVM_IRQ_ROUTING ---help--- Support hosting paravirtualized guest machines using the SIE virtualization capability on the mainframe. This should work @@ -35,11 +40,17 @@ config KVM If unsure, say N. -config KVM_TRACE - bool +config KVM_S390_UCONTROL + bool "Userspace controlled virtual machines" + depends on KVM + ---help--- + Allow CAP_SYS_ADMIN users to create KVM virtual machines that are + controlled by userspace. + + If unsure, say N. # OK, it's a little counter-intuitive to do this, but it puts it neatly under # the virtualization menu. -source drivers/virtio/Kconfig +source drivers/vhost/Kconfig endif # VIRTUALIZATION |