X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_halt.c;h=f343d06a018d05804288d8175117e405701b5778;hb=7229981629c6baa0afb61cc99cfcf6dd029c9c93;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..f343d06 100644
--- a/palacios/src/palacios/vmm_halt.c
+++ b/palacios/src/palacios/vmm_halt.c
@@ -41,11 +41,10 @@ int v3_handle_halt(struct guest_info * info) {
 	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");
-
+	    /* Yield, allowing time to pass while yielded */
 	    v3_yield(info);
-	    
+	    v3_advance_time(info);
+
 	    v3_disable_ints();
 	    v3_update_timers(info);
 	    v3_enable_ints();
@@ -59,12 +58,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"); */