From: Jack Lange <jacklange.cs.pitt.edu>
Date: Thu, 1 Aug 2013 21:32:50 +0000 (-0500)
Subject: Enable barrier participation and core stop while in halt
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=012ed696bcded41f6d3bb6c787cbc2922ed0f5aa;p=palacios.releases.git

Enable barrier participation and core stop while in halt
---

diff --git a/palacios/src/palacios/vmm_halt.c b/palacios/src/palacios/vmm_halt.c
index f6b284c..741b2d9 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
+	    if (info->core_run_state == CORE_STOPPED) { 
+		break;
+	    }
+
 	}
 
 	/* V3_Print(info->vm_info, info, "palacios: done with halt\n"); */