X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=Kconfig;h=64327907def679bf3dedbe724495bc64031a4e21;hb=51e81a720ed4c05dba61e9475a310d88f4f32e40;hp=7c72acedd0684e2f580afac703fd51990b2e51bb;hpb=bcba92d4282bcefdae71953e451cdab3b1896a46;p=palacios.git

diff --git a/Kconfig b/Kconfig
index 7c72ace..6432790 100644
--- a/Kconfig
+++ b/Kconfig
@@ -125,38 +125,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"
@@ -191,34 +163,6 @@ 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 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
 
 
@@ -260,6 +204,7 @@ config SHADOW_PAGING_CACHE1
 endmenu
 
 
+
 menu "Time Management"
 config VIRTUALIZE_TIME
 	bool "Enable Time virtualization"
@@ -288,6 +233,8 @@ config TIME_VIRTUALIZE_TSC
 	 
 endmenu
 
+
+
 menu "Symbiotic Functions"
 
 config SYMBIOTIC
@@ -329,7 +276,23 @@ 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"
 
@@ -418,12 +381,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"
@@ -439,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