Fixed stupid branch check, added more preconfig error checking

[palacios.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index 337f590..c94fcb0 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -3,12 +3,38 @@ 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 LINUX
+       bool "Linux 2.6"
+       select BUILT_IN_STDLIB
+       select BUILT_IN_ATOI
+       help
+         This enables the necessary options to compile Palacios with Linux 2.6
+          Currently, this is in development, and only 2.6.32 is verified to work
+
+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
+          (Formerly GeekOS)
+
+endchoice
 
 config CRAY_XT
         bool "Red Storm (Cray XT3/XT4)"
@@ -45,6 +71,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 +109,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 +136,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 +204,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,14 +214,6 @@ 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 SWAPBYPASS
        bool "SwapBypass"
        default n
@@ -181,6 +228,14 @@ config SWAPBYPASS_TELEMETRY
        help 
          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