X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=Kconfig;h=a524683b14d5ae9e995664c623b4c2ad8cbe1f56;hb=7d780533980c895368aa404cbdd54f7bc2d91b40;hp=5374402cdf57f9d3ba548061e5617edfd6488286;hpb=ed4aa27a4901310df5fa1127ad62645da1bb4802;p=palacios-OLD.git

diff --git a/Kconfig b/Kconfig
index 5374402..a524683 100644
--- a/Kconfig
+++ b/Kconfig
@@ -30,8 +30,10 @@ config LINUX_BUILTIN
 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
  
@@ -86,6 +88,7 @@ choice
 
 config XED
 	bool "XED decoder library"
+	depends on !LINUX
 	help
 	   This uses the XED decoder library from pintools 
 
@@ -122,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"
@@ -195,26 +170,6 @@ 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 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
 
@@ -257,6 +212,7 @@ config SHADOW_PAGING_CACHE1
 endmenu
 
 
+
 menu "Time Management"
 config VIRTUALIZE_TIME
 	bool "Enable Time virtualization"
@@ -285,6 +241,8 @@ config TIME_VIRTUALIZE_TSC
 	 
 endmenu
 
+
+
 menu "Symbiotic Functions"
 
 config SYMBIOTIC
@@ -415,12 +373,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"
@@ -436,8 +394,12 @@ config DEBUG_DEV_MGR
 	help 
 	  This turns on debugging for the device manager
 
-
-
+config DEBUG_VNET
+        depends on EXPERIMENTAL && VNET
+        bool "Enable Vnet Debug in Palacios"
+        default n
+        help
+          Enable the Vnet debug in Palacios
 
 endmenu