X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=Kconfig;h=6c11bac80eaaa2e9bc029f5f752d0583bad7f28d;hb=fe9b69407ae9ac7aeb6a9d1500c89d48953864ac;hp=bb241eee906cf69ab258db8fea7dfb242937c431;hpb=2fb33705f951901f43a9fed966e96074fc693609;p=palacios.git

diff --git a/Kconfig b/Kconfig
index bb241ee..6c11bac 100644
--- a/Kconfig
+++ b/Kconfig
@@ -57,6 +57,29 @@ config VMX
 	  Compile with support for Intel VMX
 
 
+config DEBUG_INFO
+	bool "Compile with Debug Information"
+	default n
+	help
+	  Compiles the Palacios library with debugging symbols
+
+choice 
+	prompt "X86 decoder"
+	default XED
+
+config XED
+	bool "XED decoder library"
+	help
+	   This uses the XED decoder library from pintools 
+
+config V3_DECODER
+	bool "Internal Palacios decoder"
+	help
+	    This selects the internal V3Vee x86 decoder
+
+
+endchoice
+
 menu "Supported host OS features"
       
 config MULTITHREAD_OS
@@ -95,12 +118,20 @@ config CONSOLE
 	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
+        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 socket API that is available to Palacios. This is required 
+	  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
@@ -127,13 +158,6 @@ config SHADOW_PAGING_TELEMETRY
 	  Enable telemetry information for shadow paging 
 
 
-config INSTRUMENT_VMM
-	bool "Enable VMM instrumentation"
-	default n
-	help 
-	  Enable the instrumentation framework
-	  --------
-	  This is much heavier weight than profiling
 
 config EXPERIMENTAL
 	bool "Enable Experimental options"
@@ -161,13 +185,6 @@ config DEBUG_VNET
         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
@@ -176,25 +193,11 @@ config LINUX_VIRTIO_VNET
           Enable the Virtio VNET interface
 
 config DEBUG_LINUX_VIRTIO_VNET
-        bool "VNET Virtio Device Debugging"
+        bool "Virtio VNET Interface Debugging"
         default n
         depends on LINUX_VIRTIO_VNET && DEBUG_ON
         help
-          Enable debugging for the VNET Virtio Device
-
-config LINUX_VNET_BRIDGE
-        bool "Enable VNET Bridge for Linux host"
-        default n
-        depends on PCI && EXPERIMENTAL && VNET && LINUX
-        help
-          Enable the VNET Bridge for Linux host
-
-config DEBUG_LINUX_VNET_BRIDGE
-        bool "VNET Host Linux Bridge Debug"
-        default n
-        depends on LINUX_VNET_BRIDGE && DEBUG_ON && LINUX
-        help
-          Enable debugging for the VNET Host Linux Bridge
+          Enable debugging for the VNET Virtio interface
 
 endmenu
 
@@ -238,15 +241,31 @@ endmenu
 
 
 menu "Time Management"
+config VIRTUALIZE_TIME
+	bool "Enable Time virtualization"
+	default n
+	help
+	   Enables the timer virtualization extensions
+ 
+config TIME_HIDE_VM_COST
+        bool "Hide VMM Run Cost"
+	default n
+	depends on VIRTUALIZE_TIME
+	help
+	    Offset guest time from host time sufficiently to hide the cost of
+	    running in the virtual machine. This can aid the consistency of
+	    time between multiple timers, but can cause the guest to run 
+	    a good bit slower than the host in VM-intensive parts of the code.
 
 config TIME_VIRTUALIZE_TSC
-	bool "Virtualize guest TSC"
+	bool "Fully virtualize guest TSC"
 	default n
+	depends on VIRTUALIZE_TIME
 	help
 	    Virtualize the processor time stamp counter in the guest, 
 	    generally increasing consistency between various time sources 
 	    but also potentially making guest time run slower than real time.
-
+	 
 endmenu
 
 menu "Symbiotic Functions"