X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=Kconfig;h=1d21516fce7b643caf2f9d87d23dea30119195c3;hb=8361c0d1e416802f476ebd26e385a388747a4799;hp=d484470fa2711d6f8f9739381511497caf29c55b;hpb=b1128b2a9d269fefc786c60c26878b372d5e39c1;p=palacios.releases.git

diff --git a/Kconfig b/Kconfig
index d484470..1d21516 100644
--- a/Kconfig
+++ b/Kconfig
@@ -13,7 +13,6 @@ config KITTEN
 	select BUILT_IN_STRCASECMP
 	select BUILT_IN_ATOI
 	select ALIGNED_PG_ALLOC
-	select MULTITHREAD_OS
 	help
 	  This enables the necesary options to compile Palacios with Kitten
 
@@ -103,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
 
@@ -166,8 +175,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
@@ -210,38 +232,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
@@ -301,8 +291,9 @@ config DEBUG_VNET
 
 endmenu
 
-menu "Debug configuration"
+source "palacios/src/gears/Kconfig"
 
+menu "Debug configuration"
 
 ## Is unwind information useful
 
@@ -396,6 +387,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