X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=Kconfig;h=9a7f7e7f98946abf4b68a8ffb65df5e5c75d0f9f;hb=a9a6c3664c8fdbdb9841a55d1a2fca7f4fa8f5de;hp=6c11bac80eaaa2e9bc029f5f752d0583bad7f28d;hpb=b3e5aa263c35961c74e0b7ed96b8510e8c6d7d0d;p=palacios.git

diff --git a/Kconfig b/Kconfig
index 6c11bac..9a7f7e7 100644
--- a/Kconfig
+++ b/Kconfig
@@ -17,8 +17,8 @@ config KITTEN
 	help
 	  This enables the necesary options to compile Palacios with Kitten
 
-config LINUX
-	bool "Linux 2.6"
+config LINUX_BUILTIN
+	bool "OLD Linux (Built in) -- to be deprecated"
 	select BUILT_IN_STDLIB
 	select BUILT_IN_ATOI
 	select FILE
@@ -26,6 +26,25 @@ config LINUX
 	  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 LINUX
+	bool "Linux Module"
+	select BUILT_IN_STDLIB
+	select BUILT_IN_STRDUP
+	select BUILT_IN_ATOI
+	select FILE
+	select V3_DECODER
+	help
+	  This enables the necessary options to compile Palacios as a Linux module
+ 
+
+config LINUX_KERN
+	depends on LINUX
+	string "Linux Kernel Source directory" 
+	default "/usr/src/linux"
+	help 
+	  This is the directory containing the linux source for the kernel module to be built
+
 config MINIX
 	bool "MINIX 3"
 	help
@@ -57,6 +76,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
@@ -69,6 +94,7 @@ choice
 
 config XED
 	bool "XED decoder library"
+	depends on !LINUX
 	help
 	   This uses the XED decoder library from pintools 
 
@@ -105,38 +131,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 CONSOLE
-	bool "Host Support for VM console"
-	default n
-	help 
-	  Select this if you want to forward a guest console interface to some host OS service
-
-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"
@@ -171,33 +169,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
 
@@ -240,6 +218,7 @@ config SHADOW_PAGING_CACHE1
 endmenu
 
 
+
 menu "Time Management"
 config VIRTUALIZE_TIME
 	bool "Enable Time virtualization"
@@ -268,6 +247,8 @@ config TIME_VIRTUALIZE_TSC
 	 
 endmenu
 
+
+
 menu "Symbiotic Functions"
 
 config SYMBIOTIC
@@ -309,15 +290,25 @@ 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
 
 
-menu "Debug configuration"
+endmenu
 
-config CONFIG_DEBUG_INFO
-	bool "Compile with Debug information"
-	default n
-	help 
-	 This adds the -g flag to the compilation flags
+menu "Debug configuration"
 
 
 ## Is unwind information useful
@@ -398,12 +389,12 @@ config DEBUG_EMULATOR
 	  This turns on debugging for the Instruction Emulator
 
 
-config DEBUG_XED
-	bool "XED"
+config DEBUG_DECODER
+	bool "Instruction Decoder"
 	default n
 	depends on DEBUG_ON
 	help 
-	  This turns on debugging for the Xed Decoder
+	  This turns on debugging for the selected instruction decoder
 
 config DEBUG_HALT
 	bool "Halt"
@@ -419,8 +410,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