X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=Kconfig;h=1d21516fce7b643caf2f9d87d23dea30119195c3;hb=7586c11802efb4218f142588752a6d04c0ea767d;hp=0fb4b9a6777d1b48bae2ff61dcd5348148915e27;hpb=3d68a569e5122ebb366d426d1e69f657a4201408;p=palacios.releases.git

diff --git a/Kconfig b/Kconfig
index 0fb4b9a..1d21516 100644
--- a/Kconfig
+++ b/Kconfig
@@ -175,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
@@ -219,41 +232,6 @@ config SHADOW_PAGING_CACHE1
 
 endmenu
 
-
-
-menu "Time Management"
-config TIME_DILATION
-	bool "Control Guest/Host Time Offseting"
-	default n
-	depends on EXPERIMENTAL
-	help
-	    Controls the relative speeds of the guest and host processor
-	    to allow the VM to provide the illusion of the guest seeing time
-	    pass at a different rate than the host system does.
-
-config TIME_HIDE_VM_COST
-        bool "Hide VMM Run Cost"
-	default n
-	depends on EXPERIMENTAL 
-	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 EXPERIMENTAL
-	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
@@ -313,8 +291,9 @@ config DEBUG_VNET
 
 endmenu
 
-menu "Debug configuration"
+source "palacios/src/gears/Kconfig"
 
+menu "Debug configuration"
 
 ## Is unwind information useful
 
@@ -408,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