Removal of debugging code from halt code

[palacios.git] / palacios / src / palacios / vmm_halt.c

diff --git a/palacios/src/palacios/vmm_halt.c b/palacios/src/palacios/vmm_halt.c
index b6e1a96..445f43f 100644 (file)
--- a/palacios/src/palacios/vmm_halt.c
+++ b/palacios/src/palacios/vmm_halt.c
@@ -41,11 +41,13 @@ int v3_handle_halt(struct guest_info * info)
     } else {
        uint64_t start_cycles;
        
-       PrintDebug("CPU Yield\n");
+       PrintDebug(info->vm_info, info, "CPU Yield\n");
 
        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);
@@ -58,6 +60,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,11 +72,20 @@ 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("palacios: done with halt\n"); */
+       /* V3_Print(info->vm_info, info, "palacios: done with halt\n"); */
        
        info->rip += 1;
+       
     }
 
     return 0;