From: Patrick G. Bridges <bridges@cs.unm.edu>
Date: Wed, 25 Apr 2012 14:57:29 +0000 (-0600)
Subject: Fixed merge conflict in vmm_halt.c
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=f7e4262b2d65bbe3eb0c21ab3a6c4bb185531af7;p=palacios.releases.git

Fixed merge conflict in vmm_halt.c
---

f7e4262b2d65bbe3eb0c21ab3a6c4bb185531af7
diff --cc palacios/src/palacios/vmm_halt.c
index 621b68c,a183547..eca50cf
--- a/palacios/src/palacios/vmm_halt.c
+++ b/palacios/src/palacios/vmm_halt.c
@@@ -40,15 -40,14 +40,15 @@@ int v3_handle_halt(struct guest_info * 
      } else {
  	PrintDebug("CPU Yield\n");
  
- 	while (!v3_intr_pending(info)) {
+ 	while (!v3_intr_pending(info) && (info->vm_info->run_state == VM_RUNNING)) {
 +            uint64_t t, cycles;
  	    /* Yield, allowing time to pass while yielded */
 +	    t = v3_get_host_time(&info->time_state);
  	    v3_yield(info);
 -	    v3_advance_time(info);
 +	    cycles = v3_get_host_time(&info->time_state) - t;
 +	    v3_advance_time(info, &cycles);
  
 -	    v3_disable_ints();
  	    v3_update_timers(info);
 -	    v3_enable_ints();
      	    
  	    /* At this point, we either have some combination of 
  	       interrupts, including perhaps a timer interrupt, or