X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_halt.c;h=e7862c814803a0f54a18f6480a993d4ef74a8ff0;hb=c900a49cfd8ff982a35bb7385fbd927e961569a0;hp=58a03747939b8b9125398e3cda470b5237d85693;hpb=8e9c13c41b0244a8d0029e837a623591a22c5879;p=palacios.git

diff --git a/palacios/src/palacios/vmm_halt.c b/palacios/src/palacios/vmm_halt.c
index 58a0374..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
@@ -40,15 +42,15 @@ int v3_handle_halt(struct guest_info * info) {
     } else {
 	PrintDebug("CPU Yield\n");
 
-	while (!v3_intr_pending(info)) {
-	    /* Since we're in an exit, time is already paused here, so no need to pause again. */
-	  // 	    V3_Print("palacios: halt->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 */
+	    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_yield(info);
-	    
-	    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 
@@ -59,12 +61,6 @@ int v3_handle_halt(struct guest_info * info) {
 		/* asm("hlt"); */
 	    }
 
-	   /* check if there is a core move request pending 
-	     * if there is, resume the guest with RIP on halt instruction again
-	     */
-	    if (info->core_move_state == CORE_MOVE_PENDING){
-		return 0;
-	    }
 	}
 
 	/* V3_Print("palacios: done with halt\n"); */