X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=Kconfig;h=b7fc9a02ef2cd526a70147d681d324767f434f0f;hb=81361b1fc66eb2ca2e1eb80d3c3b98c6accde9d0;hp=24d3b7d502435afbead3bebf00f20c63cc56427f;hpb=b3db1a4554c2cbcdd311f8abe4abac4c81fd6fe9;p=palacios.git

diff --git a/Kconfig b/Kconfig
index 24d3b7d..b7fc9a0 100644
--- a/Kconfig
+++ b/Kconfig
@@ -13,7 +13,6 @@ config KITTEN
 	select BUILT_IN_STRCASECMP
 	select BUILT_IN_ATOI
 	select ALIGNED_PG_ALLOC
-	select MULTITHREAD_OS
 	help
 	  This enables the necesary options to compile Palacios with Kitten
 
@@ -76,6 +75,12 @@ config VMX
 	  Compile with support for Intel VMX
 
 
+config FRAME_POINTER
+	bool "Compile with Frame pointers"
+	default n
+	help
+	  Compiles the Palacios library with Frame pointers
+
 config DEBUG_INFO
 	bool "Compile with Debug Information"
 	default n
@@ -102,13 +107,6 @@ endchoice
 
 menu "Supported host OS features"
       
-config MULTITHREAD_OS
-	bool "Host support for  multiple threads"
-	default y
-	help 
-	  Select this if your OS supports multiple threads of execution. This will enable features in Palacios 
-	  to require the creation of additional execution threads.
-
 
 config ALIGNED_PG_ALLOC
 	bool "Host support for aligned page allocations"
@@ -125,53 +123,10 @@ config MAX_CPUS
 	  Specifies the maximum number of hardware CPUs supported by the OS
 	  For uniprocessor environments, set this to 1
 
-config FILE
-	bool "Host Support for file operations"
-	default n
-	help
-	  Select this if your host OS supports file operatoins and you want Palacios to be able to use them.
-
-config KEYED_STREAMS
-	bool "Host support for keyed streams"
-	default n
-	help
-	  Select this if your host OS supports keyed streams
-          Palacios Checkpoint/Restore and Migration depends on this feature
-
-config CONSOLE
-	bool "Host Support for VM text-mode console"
-	default n
-	help 
-	  Select this if you want to forward a guest console interface to some host OS service
-          This is for a TEXT MODE console.   Select the framebuffer console for graphics and text
-
-config GRAPHICS_CONSOLE
-	bool "Host Support for VM graphics and text-mode console based on a frame buffer"
-	default n
-	help 
-	  Select this if you want to forward a guest graphics-mode (and text-mode) console 
-          interface to some host OS service.  This is for a GRAPHICS console based on a shared frame buffer.
-          Text mode output is RENDERED onto the framebuffer
-
-config SOCKET
-        bool "Host support for Network Sockets"
-        default y
-        help
-          Select this if you host OS implements a socket API that is available to Palacios. This is required
-          to support the internal networking features of Palacios.
-
-
-config PACKET
-	bool "Host support for Raw Packet Transmision"
-	depends on EXPERIMENTAL
-	default n
-	help 
-	  Select this if you host OS implements a raw packet network API that is available to Palacios. This is required 
-	  to support the internal networking features of Palacios.
-
 endmenu
 
-
+source "palacios/src/interfaces/Kconfig"
+source "palacios/src/extensions/Kconfig"
 
 config TELEMETRY
 	bool "Enable VMM telemetry support"
@@ -206,33 +161,13 @@ config EXPERIMENTAL
 	  The purpose of this option is to allow features under development to be committed to the mainline
 	  to more easily track changes and provide access to multiple developers
 
-config VNET
-        depends on EXPERIMENTAL
-        bool "Enable Vnet in Palacios"
-        default n
-        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 CHECKPOINT
+	bool "Enable Checkpointing"
+	default n
+	help 
+	  Temporary option to enable experimental checkpoint code
 
-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 "Virtio VNET Interface Debugging"
-        default n
-        depends on LINUX_VIRTIO_VNET && DEBUG_ON
-        help
-          Enable debugging for the VNET Virtio interface
 
 endmenu
 
@@ -275,6 +210,7 @@ config SHADOW_PAGING_CACHE1
 endmenu
 
 
+
 menu "Time Management"
 config VIRTUALIZE_TIME
 	bool "Enable Time virtualization"
@@ -303,6 +239,8 @@ config TIME_VIRTUALIZE_TSC
 	 
 endmenu
 
+
+
 menu "Symbiotic Functions"
 
 config SYMBIOTIC
@@ -344,16 +282,26 @@ menuconfig SYMMOD
 
 endmenu
 
+menu "VNET"
+
+config VNET
+        bool "Enable Vnet in Palacios"
+        default n
+        help
+          Enable the Vnet in Palacios
+
+config DEBUG_VNET
+        depends on VNET
+        bool "Enable Vnet Debug in Palacios"
+        default n
+        help
+          Enable the Vnet debug in Palacios
+
 
+endmenu
 
 menu "Debug configuration"
 
-config CONFIG_DEBUG_INFO
-	bool "Compile with Debug information"
-	default n
-	help 
-	 This adds the -g flag to the compilation flags
-
 
 ## Is unwind information useful
 
@@ -454,8 +402,12 @@ config DEBUG_DEV_MGR
 	help 
 	  This turns on debugging for the device manager
 
-
-
+config DEBUG_MEM_ERRORS
+    bool "Verbose memory errors"
+    default n
+    depends on DEBUG_ON
+    help
+      This turns on debugging for memory translations and lookups
 
 endmenu