Commit:     d3d1c4bdf16bd154d9f27f34fca28edca90465eb
Parent:     0895e91d60ef9bdef426d1ce14bb94bd5875870d
Author:     Rusty Russell <[EMAIL PROTECTED]>
AuthorDate: Mon Oct 22 10:55:21 2007 +1000
Committer:  Rusty Russell <[EMAIL PROTECTED]>
CommitDate: Tue Oct 23 15:49:47 2007 +1000

    Normalize config options for guest support
    1) Group all the "guest OS" support options together, under a PARAVIRT_GUEST
    2) Make those options select CONFIG_PARAVIRT, as suggested by Andi.
    3) Make kconfig help titles consistent.
    Signed-off-by: Rusty Russell <[EMAIL PROTECTED]>
    Cc: Andi Kleen <[EMAIL PROTECTED]>
    Cc: Zach Amsden <[EMAIL PROTECTED]>
    Cc: Jeremy Fitzhardinge <[EMAIL PROTECTED]>
    Cc: Chris Wright <[EMAIL PROTECTED]>
 arch/i386/Kconfig      |   38 ++++++++++++++++++++++++++++----------
 arch/x86/xen/Kconfig   |    5 +++--
 drivers/lguest/Kconfig |    3 +--
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index f6e44fc..3523e82 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)
-         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 
 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)
          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.
+       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.
 config ACPI_SRAT
        default y
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
index 9df99e1..fbfa55c 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 && 
          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 41e2250..64e1bb3 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 || 
        select HVC_DRIVER
          This is a very simple module which allows you to run
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to