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 eca50cf..445f43f 100644 (file)
--- a/palacios/src/palacios/vmm_halt.c
+++ b/palacios/src/palacios/vmm_halt.c
@@ -21,6 +21,7 @@
 #include <palacios/vmm_halt.h>
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_lowlevel.h> 
+#include <palacios/vmm_perftune.h>
 
 #ifndef V3_CONFIG_DEBUG_HALT
 #undef PrintDebug
@@ -28,27 +29,39 @@
 #endif
 
 
-
 //
 // This should trigger a #GP if cpl != 0, otherwise, yield to host
 //
 
-int v3_handle_halt(struct guest_info * info) {
-
+int v3_handle_halt(struct guest_info * info) 
+{
+    
     if (info->cpl != 0) { 
        v3_raise_exception(info, GPF_EXCEPTION);
     } else {
-       PrintDebug("CPU Yield\n");
+       uint64_t start_cycles;
+       
+       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;
-           /* Yield, allowing time to pass while yielded */
+
            t = v3_get_host_time(&info->time_state);
-           v3_yield(info);
+
+           /* Yield, allowing time to pass while yielded */
+           v3_strategy_driven_yield(info, v3_cycle_diff_in_usec(info, start_cycles, t));
+
            cycles = v3_get_host_time(&info->time_state) - t;
+
            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 
@@ -59,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;