X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=Kconfig;h=106d8fa44d0f7fc546f988219e66ff376b95d770;hb=e59d15ae2aab909879f817c3f45400d92af98a43;hp=a9cc6acbd9469bf2a1ef722d667dc0812d094fd3;hpb=ee1279646a778613b23a42350b903ebb57c068f8;p=palacios.git

diff --git a/Kconfig b/Kconfig
index a9cc6ac..106d8fa 100644
--- a/Kconfig
+++ b/Kconfig
@@ -3,12 +3,29 @@ mainmenu "Palacios VMM Configuration"
 menu "Target Configuration"
 
 
+choice
+	prompt "Target Host OS"
+	default KITTEN
+
 config KITTEN
-	bool "Set defaults needed for the Kitten OS"
-	default y
+	bool "Kitten OS"
+	select BUILT_IN_STDLIB
+	select BUILT_IN_STRCASECMP
+	select BUILT_IN_ATOI
+	help
+	  This enables the necesary options to compile Palacios with Kitten
+
+config MINIX
+	bool "MINIX 3"
 	help
 	  This enables the necesary options to compile Palacios with Kitten
 
+config OTHER_OS
+	bool "Other OS"
+	help 
+	  Choose this to compile Palacios for a Generic Host OS
+
+endchoice
 
 config CRAY_XT
         bool "Red Storm (Cray XT3/XT4)"
@@ -45,6 +62,15 @@ config MAX_CPUS
 	  For uniprocessor environments, set this to 1
 
 
+config CONSOLE
+	bool "Include Console Support"
+	default n
+	help 
+	  Enable console support in Palacios
+
+
+
+
 config SOCKET
 	bool "Include Network Socket Support"
 	default y
@@ -74,13 +100,6 @@ config SHADOW_PAGING_TELEMETRY
 	  Enable telemetry information for shadow paging 
 
 
-config PASSTHROUGH_VIDEO
-	bool "Enable Passthrough Video"
-	default y
-	help 
-	  Configures Palacios to map a guest's framebuffer directly 
-	  to the hardware framebuffer
-
 config INSTRUMENT_VMM
 	bool "Enable VMM instrumentation"
 	default n
@@ -108,6 +127,34 @@ config VNET
         help
           Enable the Vnet in Palacios
 
+config DEBUG_VNET
+        depends on EXPERIMENTAL && VNET
+        bool "Enable Vnet Debug in Palacios"
+        default n
+        help
+          Enable the Vnet debug in Palacios
+
+config VNET_PROFILE
+	depends on EXPERIMENTAL && VNET
+	bool "Enable Vnet Profiling in Palacios"
+	default n
+	help
+          Enable the Vnet performance profiling in Palacios
+
+config LINUX_VIRTIO_VNET
+        bool "Enable Virtio VNET interface"
+        default n
+        depends on PCI && EXPERIMENTAL && VNET
+        help
+          Enable the Virtio VNET interface
+
+config DEBUG_LINUX_VIRTIO_VNET
+        bool "VNET Virtio Device Debugging"
+        default n
+        depends on LINUX_VIRTIO_VNET && DEBUG_ON
+        help
+          Enable debugging for the VNET Virtio Device
+
 endmenu
 
 
@@ -148,9 +195,8 @@ config SYMBIOTIC
 	bool "Enable Symbiotic Functionality"
 	default n
 	help 
-	  Enable Symbiotic components of the VMM
-
-
+	  Enable Symbiotic components of the VMM. 
+	  This includes the SymSpy interface.
 
 config SYMCALL
 	bool "Symbiotic upcalls"
@@ -159,27 +205,27 @@ config SYMCALL
 	help
 	  Enables the Symbiotic upcall interface
 
-config SYMMOD
-	bool "Symbiotic Modules"
-	default n
-	depends on SYMBIOTIC && EXPERIMENTAL
-	help
-	  Enable Symbiotic module loading
-
-
-config SYMBIOTIC_SWAP
-	bool "Symbiotic Swap"
+config SWAPBYPASS
+	bool "SwapBypass"
 	default n
 	depends on SYMBIOTIC && SYMCALL && EXPERIMENTAL
 	help 
-	  This enables the symbiotic swap architecture
+	  This enables the SwapBypass architecture
 
-config SYMBIOTIC_SWAP_TELEMETRY
-	bool "Enable Symbiotic Swap Telemetry"
+config SWAPBYPASS_TELEMETRY
+	bool "Enable SwapBypass Telemetry"
 	default n
-	depends on TELEMETRY && SYMBIOTIC_SWAP
+	depends on TELEMETRY && SWAPBYPASS
 	help 
-	  Enable the telemetry information for the symbiotic swap subsystem
+	  Enable the telemetry information for the SwapBypass subsystem
+
+menuconfig SYMMOD 
+	bool "Symbiotic Modules"
+	default n
+	depends on EXPERIMENTAL
+#	depends on SYMBIOTIC
+	help
+	  Enable Symbiotic module loading
 
 
 endmenu