X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_halt.c;h=445f43fecfd6437161a7aa856888071fd93b27db;hb=40a6dd36505a959c132c32497aa50bd74afd8250;hp=bb4a46a078489e4b881161f161bff7f32fd41da8;hpb=3b0d98aaf40fd7a1bfc3bc736144386636cc7a73;p=palacios.git

diff --git a/palacios/src/palacios/vmm_halt.c b/palacios/src/palacios/vmm_halt.c
index bb4a46a..445f43f 100644
--- a/palacios/src/palacios/vmm_halt.c
+++ b/palacios/src/palacios/vmm_halt.c
@@ -21,6 +21,7 @@
 #include <palacios/vmm_halt.h>
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_lowlevel.h> 
+#include <palacios/vmm_perftune.h>
 
 #ifndef V3_CONFIG_DEBUG_HALT
 #undef PrintDebug
@@ -28,27 +29,39 @@
 #endif
 
 
-
 //
 // This should trigger a #GP if cpl != 0, otherwise, yield to host
 //
 
-int v3_handle_halt(struct guest_info * info) {
-
+int v3_handle_halt(struct guest_info * info) 
+{
+    
     if (info->cpl != 0) { 
 	v3_raise_exception(info, GPF_EXCEPTION);
     } else {
-	PrintDebug("CPU Yield\n");
+	uint64_t start_cycles;
+	
+	PrintDebug(info->vm_info, info, "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");
+	start_cycles  = v3_get_host_time(&info->time_state);
+
+	while (!v3_intr_pending(info) &&
+	       !v3_excp_pending(info) &&
+	       (info->vm_info->run_state == VM_RUNNING)) {
+            uint64_t t, cycles;
+
+	    t = v3_get_host_time(&info->time_state);
+
+	    /* Yield, allowing time to pass while yielded */
+	    v3_strategy_driven_yield(info, v3_cycle_diff_in_usec(info, start_cycles, t));
+
+	    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 
@@ -58,11 +71,21 @@ int v3_handle_halt(struct guest_info * info) {
 		/* if no interrupt, then we do halt */
 		/* asm("hlt"); */
 	    }
+
+	    // participate in any barrier that might be raised
+	    v3_wait_at_barrier(info);
+
+	    // stop if the VM is being halted or core is being reset
+	    if (info->core_run_state == CORE_STOPPED || info->core_run_state == CORE_RESETTING) { 
+		break;
+	    }
+
 	}
 
-	/* V3_Print("palacios: done with halt\n"); */
+	/* V3_Print(info->vm_info, info, "palacios: done with halt\n"); */
 	
 	info->rip += 1;
+	
     }
 
     return 0;