X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_halt.c;h=bfe2e5ac43c201e83bd50a294d995cc28319c98f;hb=94429f4b9268cf4d5f86dee5c3d929110811ac80;hp=5015046ed5b2fa7ea6ab1e9f50f9489082f101b1;hpb=c4e343e346404fcc7674dcfa32e588a282be0f86;p=palacios.git

diff --git a/palacios/src/palacios/vmm_halt.c b/palacios/src/palacios/vmm_halt.c
index 5015046..bfe2e5a 100644
--- a/palacios/src/palacios/vmm_halt.c
+++ b/palacios/src/palacios/vmm_halt.c
@@ -20,9 +20,9 @@
 
 #include <palacios/vmm_halt.h>
 #include <palacios/vmm_intr.h>
+#include <palacios/vmm_lowlevel.h> 
 
-
-#ifndef CONFIG_DEBUG_HALT
+#ifndef V3_CONFIG_DEBUG_HALT
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -38,27 +38,30 @@ int v3_handle_halt(struct guest_info * info) {
     if (info->cpl != 0) { 
 	v3_raise_exception(info, GPF_EXCEPTION);
     } else {
-	uint64_t yield_start = 0;
-	
 	PrintDebug("CPU Yield\n");
 
 	while (!v3_intr_pending(info)) {
-	    rdtscll(yield_start);
+	    /* Since we're in an exit, time is already paused here, so no need to pause again. */
+	  // 	    V3_Print("palacios: halt->yield\n");
+
 	    v3_yield(info);
 	    
-	    v3_update_time(info, yield_start - info->time_state.cached_host_tsc);
-	    
-	    rdtscll(info->time_state.cached_host_tsc);
-	    
+	    v3_disable_ints();
+	    v3_update_timers(info);
+	    v3_enable_ints();
+    	    
 	    /* At this point, we either have some combination of 
 	       interrupts, including perhaps a timer interrupt, or 
 	       no interrupt.
 	    */
 	    if (!v3_intr_pending(info)) {
 		/* if no interrupt, then we do halt */
-		asm("hlt");
+		/* asm("hlt"); */
 	    }
+
 	}
+
+	/* V3_Print("palacios: done with halt\n"); */
 	
 	info->rip += 1;
     }