Fixed merge conflict in vmm_halt.c

diff --cc palacios/src/palacios/svm.c
Simple merge

diff --cc palacios/src/palacios/vmm_halt.c
index 621b68c,a183547..eca50cf
--- 1/palacios/src/palacios/vmm_halt.c
--- 2/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