X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_halt.c;h=7dbc8ade83041ea5918b438ec3972e96c9650345;hb=5641fc7c3abf79756d28a28da8c15b4addf26fe5;hp=b6e1a9654f0a1b7809ac2c5b0ce2ea40b08320f7;hpb=5f9290a9547c1497c6070b35e32caa7fc388d189;p=palacios.git

diff --git a/palacios/src/palacios/vmm_halt.c b/palacios/src/palacios/vmm_halt.c
index b6e1a96..7dbc8ad 100644
--- a/palacios/src/palacios/vmm_halt.c
+++ b/palacios/src/palacios/vmm_halt.c
@@ -41,11 +41,13 @@ int v3_handle_halt(struct guest_info * info)
     } else {
 	uint64_t start_cycles;
 	
-	PrintDebug("CPU Yield\n");
+	PrintDebug(info->vm_info, info, "CPU Yield\n");
 
 	start_cycles  = v3_get_host_time(&info->time_state);
 
-	while (!v3_intr_pending(info) && (info->vm_info->run_state == VM_RUNNING)) {
+	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);
@@ -58,6 +60,8 @@ int v3_handle_halt(struct guest_info * info)
 	    v3_advance_time(info, &cycles);
 
 	    v3_update_timers(info);
+	    
+
     	    
 	    /* At this point, we either have some combination of 
 	       interrupts, including perhaps a timer interrupt, or 
@@ -68,11 +72,24 @@ int v3_handle_halt(struct guest_info * info)
 		/* 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;
+	
+	if (info->vcpu_id==2) { 
+	  V3_Print(info->vm_info,info,"palacios: finishing halt with exppend=%d intrpend=%d\n", v3_excp_pending(info), v3_intr_pending(info));
+	}
+
     }
 
     return 0;