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=741b2d979efc9f6a5d1548510428add7eff578f8;hpb=012ed696bcded41f6d3bb6c787cbc2922ed0f5aa;p=palacios.git

diff --git a/palacios/src/palacios/vmm_halt.c b/palacios/src/palacios/vmm_halt.c
index 741b2d9..7dbc8ad 100644
--- a/palacios/src/palacios/vmm_halt.c
+++ b/palacios/src/palacios/vmm_halt.c
@@ -45,7 +45,9 @@ int v3_handle_halt(struct guest_info * info)
 
 	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);
@@ -73,8 +75,8 @@ int v3_handle_halt(struct guest_info * info)
 	    // participate in any barrier that might be raised
 	    v3_wait_at_barrier(info);
 
-	    // stop if the VM is being halted
-	    if (info->core_run_state == CORE_STOPPED) { 
+	    // 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;
 	    }
 
@@ -83,6 +85,11 @@ int v3_handle_halt(struct guest_info * info)
 	/* 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;