X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_halt.c;h=e7862c814803a0f54a18f6480a993d4ef74a8ff0;hb=25aec1d035e5a740d8c1cb936d7633b6bb5751f1;hp=a1835478e751587f642aa5aced25723bb4a94894;hpb=5162b3f7c10ddbd4fd54e0c2dd13f147af09c314;p=palacios.git

diff --git a/palacios/src/palacios/vmm_halt.c b/palacios/src/palacios/vmm_halt.c
index a183547..e7862c8 100644
--- a/palacios/src/palacios/vmm_halt.c
+++ b/palacios/src/palacios/vmm_halt.c
@@ -28,6 +28,8 @@
 #endif
 
 
+#define YIELD_TIME_USEC 1000
+
 
 //
 // This should trigger a #GP if cpl != 0, otherwise, yield to host
@@ -41,13 +43,14 @@ int v3_handle_halt(struct guest_info * info) {
 	PrintDebug("CPU Yield\n");
 
 	while (!v3_intr_pending(info) && (info->vm_info->run_state == VM_RUNNING)) {
+            uint64_t t, cycles;
 	    /* Yield, allowing time to pass while yielded */
-	    v3_yield(info);
-	    v3_advance_time(info);
+	    t = v3_get_host_time(&info->time_state);
+	    v3_yield(info,YIELD_TIME_USEC);
+	    cycles = v3_get_host_time(&info->time_state) - t;
+	    v3_advance_time(info, &cycles);
 
-	    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