Updates to some debugging of time virtualization. Adding infrasructer to support...

[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 fc6d3d5..f343d06 100644 (file)
--- a/palacios/src/palacios/vmm_halt.c
+++ b/palacios/src/palacios/vmm_halt.c
@@ -20,7 +20,7 @@
 
 #include <palacios/vmm_halt.h>
 #include <palacios/vmm_intr.h>
-
+#include <palacios/vmm_lowlevel.h> 
 
 #ifndef V3_CONFIG_DEBUG_HALT
 #undef PrintDebug
@@ -41,19 +41,26 @@ int v3_handle_halt(struct guest_info * info) {
        PrintDebug("CPU Yield\n");
 
        while (!v3_intr_pending(info)) {
-           /* Since we're in an exit, time is already paused here, so no need to pause again. */
+           /* Yield, allowing time to pass while yielded */
            v3_yield(info);
+           v3_advance_time(info);
+
+           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 
               no interrupt.
            */
            if (!v3_intr_pending(info)) {
                /* if no interrupt, then we do halt */
-               asm("hlt");
+               /* asm("hlt"); */
            }
+
        }
+
+       /* V3_Print("palacios: done with halt\n"); */
        
        info->rip += 1;
     }