Fixed merge conflict in vmm_halt.c

[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 056d568..eca50cf 100644 (file)
--- a/palacios/src/palacios/vmm_halt.c
+++ b/palacios/src/palacios/vmm_halt.c
@@ -20,9 +20,9 @@
 
 #include <palacios/vmm_halt.h>
 #include <palacios/vmm_intr.h>
+#include <palacios/vmm_lowlevel.h> 
 
-
-#ifndef CONFIG_DEBUG_HALT
+#ifndef V3_CONFIG_DEBUG_HALT
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -38,36 +38,30 @@ int v3_handle_halt(struct guest_info * info) {
     if (info->cpl != 0) { 
        v3_raise_exception(info, GPF_EXCEPTION);
     } else {
-    
-       uint64_t yield_start = 0;
-       uint64_t yield_stop = 0;
-       uint32_t gap = 0;
-       
        PrintDebug("CPU Yield\n");
-       
-       rdtscll(yield_start);
-       v3_yield(info);
-       rdtscll(yield_stop);
-    
-    
-       //v3_update_time(info, yield_stop - yield_start);
-       gap = yield_stop - yield_start;
 
-       /*  WARNING!!! WARNING!!!
-        *  
-        * DO NOT REMOVE THIS CONDITIONAL!!!
-        *
-        * It is common for an OS to issue an IO op, and then sit in a halt loop
-        * waiting for the device to complete and raise an irq.
-        * If you remove this then the timer interrupt will ALWAYS subvert the completion 
-        * interrupt and stall the guest.
-        */
-       if (!v3_intr_pending(info)) {
-           v3_advance_time(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);
+           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 
+              no interrupt.
+           */
+           if (!v3_intr_pending(info)) {
+               /* if no interrupt, then we do halt */
+               /* asm("hlt"); */
+           }
+
        }
 
-       
-       PrintDebug("CPU Yield Done (%d cycles)\n", gap);
+       /* V3_Print("palacios: done with halt\n"); */
        
        info->rip += 1;
     }