X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_halt.c;h=57aee0fffe39ccdbccb950f9037a12369de09fde;hb=d57b407f9d05a21303bc2c94cbd5142de130be48;hp=f6b284cffec5053385ac947d8f045d10fe771b8c;hpb=acaadd79c597c8d5180fbfbec79c01fef3dff003;p=palacios.git

diff --git a/palacios/src/palacios/vmm_halt.c b/palacios/src/palacios/vmm_halt.c
index f6b284c..57aee0f 100644
--- a/palacios/src/palacios/vmm_halt.c
+++ b/palacios/src/palacios/vmm_halt.c
@@ -58,6 +58,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,6 +70,14 @@ 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(info->vm_info, info, "palacios: done with halt\n"); */