Commit d3d1c4bd authored by Rusty Russell's avatar Rusty Russell
Browse files

Normalize config options for guest support 



1) Group all the "guest OS" support options together, under a PARAVIRT_GUEST
   menu.
2) Make those options select CONFIG_PARAVIRT, as suggested by Andi.
3) Make kconfig help titles consistent.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Cc: Andi Kleen <ak@suse.de>
Cc: Zach Amsden <zach@vmware.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Chris Wright <chrisw@sous-sol.org>
parent 0895e91d

arch/i386/Kconfig

+28 −10
Original line number Original line Diff line number Diff line
@@ -227,28 +227,46 @@ config SCHED_NO_NO_OMIT_FRAME_POINTER 
	  If in doubt, say "Y".

	  If in doubt, say "Y".





config PARAVIRT

config PARAVIRT

	bool "Paravirtualization support (EXPERIMENTAL)"

	bool

	depends on EXPERIMENTAL

	depends on !(X86_VISWS || X86_VOYAGER)

	depends on !(X86_VISWS || X86_VOYAGER)

	help

	help

	  Paravirtualization is a way of running multiple instances of

	  This changes the kernel so it can modify itself when it is run

	  Linux on the same machine, under a hypervisor.  This option

	  under a hypervisor, potentially improving performance significantly

	  changes the kernel so it can modify itself when it is run

	  over full virtualization.  However, when run without a hypervisor

	  under a hypervisor, improving performance significantly.

	  the kernel is theoretically slower and slightly larger.

	  However, when run without a hypervisor the kernel is



	  theoretically slower.  If in doubt, say N.

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"

source "arch/x86/xen/Kconfig"





config VMI

config VMI

	bool "VMI Paravirt-ops support"

	bool "VMI Guest support"

	depends on PARAVIRT

	select PARAVIRT

	depends on !(X86_VISWS || X86_VOYAGER)

	help

	help

	  VMI provides a paravirtualized interface to the VMware ESX server

	  VMI provides a paravirtualized interface to the VMware ESX server

	  (it could be used by other hypervisors in theory too, but is not

	  (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

	  at the moment), by linking the kernel to a GPL-ed ROM module

	  provided by the hypervisor.

	  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

config ACPI_SRAT

	bool

	bool

	default y

	default y

arch/x86/xen/Kconfig

+3 −2
Original line number Original line Diff line number Diff line
@@ -3,8 +3,9 @@ 
#

#





config XEN

config XEN

	bool "Enable support for Xen hypervisor"

	bool "Xen guest support"

	depends on PARAVIRT && X86_CMPXCHG && X86_TSC && !NEED_MULTIPLE_NODES

	select PARAVIRT

	depends on X86_CMPXCHG && X86_TSC && !NEED_MULTIPLE_NODES && !(X86_VISWS || X86_VOYAGER)

	help

	help

	  This is the Linux Xen port.  Enabling this will allow the

	  This is the Linux Xen port.  Enabling this will allow the

	  kernel to boot in a paravirtualized environment under the

	  kernel to boot in a paravirtualized environment under the

drivers/lguest/Kconfig

+1 −2
Original line number Original line Diff line number Diff line 
config LGUEST

config LGUEST

	tristate "Linux hypervisor example code"

	tristate "Linux hypervisor example code"

	depends on X86 && PARAVIRT && EXPERIMENTAL && !X86_PAE && FUTEX

	depends on X86 && EXPERIMENTAL && !X86_PAE && FUTEX && !(X86_VISWS || X86_VOYAGER)

	select LGUEST_GUEST

	select HVC_DRIVER

	select HVC_DRIVER

	---help---

	---help---

	  This is a very simple module which allows you to run

	  This is a very simple module which allows you to run

CRA Git | Maintained and supported by SUSTech CRA and CCSE