From: Peter Dinda <pdinda@northwestern.edu>
Date: Sun, 2 Aug 2015 23:14:02 +0000 (-0500)
Subject: Leave a HLT on exception injection
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=5641fc7c3abf79756d28a28da8c15b4addf26fe5

Leave a HLT on exception injection
---

diff --git a/palacios/src/palacios/vmm_halt.c b/palacios/src/palacios/vmm_halt.c
index 57aee0f..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);
@@ -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;