X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=Kconfig;h=7e231b00e49679aac4d65f3e3e0bbb861cad6409;hb=d57f8d9bfe308d853e37f0eebd3fe58f04d8739b;hp=b7fc9a02ef2cd526a70147d681d324767f434f0f;hpb=33a5c8f83ba79ece7a76cf7c4d53bdeae1e30f07;p=palacios.git

diff --git a/Kconfig b/Kconfig
index b7fc9a0..7e231b0 100644
--- a/Kconfig
+++ b/Kconfig
@@ -102,6 +102,16 @@ config V3_DECODER
 	help
 	    This selects the internal V3Vee x86 decoder
 
+config QUIX86
+    bool "QUIX86 decoder"
+    help
+        This selects the QUIX86 decoder library
+
+config QUIX86_DEBUG
+    bool "QUIX86 decoder debug version"
+    help
+        This selects the QUIX86 decoder library compiled w/o optimization
+        and with debug info
 
 endchoice
 
@@ -147,7 +157,21 @@ config SHADOW_PAGING_TELEMETRY
 	help
 	  Enable telemetry information for shadow paging 
 
+config PMU_TELEMETRY
+      bool "Enable PMU telemetry"
+      default n
+      depends on TELEMETRY && HOST_PMU
+      help
+        Enable telemetry information for a range of PMU counters
+          This causes the currently configured PMU counts to be printed
 
+config PWRSTAT_TELEMETRY
+	bool "Enable power statistics telemetry"
+	default n
+	depends on TELEMETRY && HOST_PWRSTAT
+	help
+		Enable telemetry information for power/energy counters 
+		
 
 config EXPERIMENTAL
 	bool "Enable Experimental options"
@@ -165,8 +189,21 @@ config CHECKPOINT
 	bool "Enable Checkpointing"
 	default n
 	help 
-	  Temporary option to enable experimental checkpoint code
+	  Enable checkpointing functionality (save/load VMs)
+
+config LIVE_MIGRATION
+	bool "Enable Live Migration"
+	depends on CHECKPOINT
+	default n
+	help
+          Enable live migration functionality (send/receive VMs)
 
+config DEBUG_CHECKPOINT
+	bool "Enable Checkpointing and Live Migration Debugging Output"
+	depends on CHECKPOINT
+	default n
+	help
+	  Generate output from the debugging statements in checkpointing and live migration
 
 
 endmenu
@@ -209,38 +246,6 @@ config SHADOW_PAGING_CACHE1
 
 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 "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"
 
 config SYMBIOTIC
@@ -300,8 +305,9 @@ config DEBUG_VNET
 
 endmenu
 
-menu "Debug configuration"
+source "palacios/src/gears/Kconfig"
 
+menu "Debug configuration"
 
 ## Is unwind information useful
 
@@ -365,6 +371,20 @@ config DEBUG_TIME
 	help
 	  This turns on debugging of system time virtualization
 
+config DEBUG_SCHEDULER
+    bool "Scheduler"
+    default n
+    depends on DEBUG_ON
+    help
+      This turns on debugging for scheduler
+
+config DEBUG_CPU_MAPPER
+    bool "CPU Mapper"
+    default n
+    depends on DEBUG_ON
+    help
+      This turns on debugging for CPU Mapper
+
 config DEBUG_IO
 	bool "IO"
 	default n
@@ -395,6 +415,13 @@ config DEBUG_HALT
 	help 
 	  This turns on debugging for the halt instruction handler
 
+config DEBUG_MWAIT
+	bool "MWAIT/MONITOR"
+	default n
+	depends on DEBUG_ON
+	help 
+	  This turns on debugging for the mwait and monitor instruction handlers
+
 config DEBUG_DEV_MGR
 	bool "Device Manager"
 	default n
@@ -409,6 +436,21 @@ config DEBUG_MEM_ERRORS
     help
       This turns on debugging for memory translations and lookups
 
+config DEBUG_LOCKS
+    bool "Lock debugging (if host supports it)"
+    default n
+    depends on DEBUG_ON
+    help
+      This turns on lock debugging for locks in Palacios and in its host-specifc glue code.  This requires host support.
+
+config DEBUG_MEM_ALLOC
+    bool "Memory allocation debugging (if host supports it)"
+    default n
+    depends on DEBUG_ON
+    help
+      This turns on memory allocation debugging in Palacios, using the mechanisms provided by the host
+
+
 endmenu