3 files changed, 32 insertions, 14 deletions

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index f6e44fc5283c..3523e82c8412 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -227,28 +227,46 @@ config SCHED_NO_NO_OMIT_FRAME_POINTER
           If in doubt, say "Y".
 
 config PARAVIRT
-        bool "Paravirtualization support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        bool
         depends on !(X86_VISWS || X86_VOYAGER)
         help
-          Paravirtualization is a way of running multiple instances of
-          Linux on the same machine, under a hypervisor.  This option
-          changes the kernel so it can modify itself when it is run
-          under a hypervisor, improving performance significantly.
-          However, when run without a hypervisor the kernel is
-          theoretically slower.  If in doubt, say N.
+          This changes the kernel so it can modify itself when it is run
+          under a hypervisor, potentially improving performance significantly
+          over full virtualization.  However, when run without a hypervisor
+          the kernel is theoretically slower and slightly larger.
+
+menuconfig PARAVIRT_GUEST
+        bool "Paravirtualized guest support"
+        help
+          Say Y here to get to see options related to running Linux under
+          various hypervisors.  This option alone does not add any kernel code.
+
+          If you say N, all options in this submenu will be skipped and disabled.
+
+if PARAVIRT_GUEST
 
 source "arch/x86/xen/Kconfig"
 
 config VMI
-        bool "VMI Paravirt-ops support"
-        depends on PARAVIRT
+        bool "VMI Guest support"
+        select PARAVIRT
+        depends on !(X86_VISWS || X86_VOYAGER)
         help
           VMI provides a paravirtualized interface to the VMware ESX server
           (it could be used by other hypervisors in theory too, but is not
           at the moment), by linking the kernel to a GPL-ed ROM module
           provided by the hypervisor.
 
+config LGUEST_GUEST
+        bool "Lguest guest support"
+        select PARAVIRT
+        depends on !X86_PAE
+        help
+          Lguest is a tiny in-kernel hypervisor.  Selecting this will
+          allow your kernel to boot under lguest.  This option will increase
+          your kernel size by about 6k.  If in doubt, say N.
+endif
+
 config ACPI_SRAT
         bool
         default y
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
index 9df99e1885a4..fbfa55ce0d55 100644
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@ -3,8 +3,9 @@
 #
 
 config XEN
-        bool "Enable support for Xen hypervisor"
-        depends on PARAVIRT && X86_CMPXCHG && X86_TSC && !NEED_MULTIPLE_NODES
+        bool "Xen guest support"
+        select PARAVIRT
+        depends on X86_CMPXCHG && X86_TSC && !NEED_MULTIPLE_NODES && !(X86_VISWS || X86_VOYAGER)
         help
           This is the Linux Xen port.  Enabling this will allow the
           kernel to boot in a paravirtualized environment under the
diff --git a/drivers/lguest/Kconfig b/drivers/lguest/Kconfig
index 41e2250613a1..64e1bb31c5b4 100644
--- a/drivers/lguest/Kconfig
+++ b/drivers/lguest/Kconfig
@@ -1,7 +1,6 @@
 config LGUEST
         tristate "Linux hypervisor example code"
-        depends on X86 && PARAVIRT && EXPERIMENTAL && !X86_PAE && FUTEX
-        select LGUEST_GUEST
+        depends on X86 && EXPERIMENTAL && !X86_PAE && FUTEX && !(X86_VISWS || X86_VOYAGER)
         select HVC_DRIVER
         ---help---
           This is a very simple module which allows you to run