Change to internal v3_yield/yield_cond semantics:

[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 7970a40..e7862c8 100644 (file)
--- a/palacios/src/palacios/vmm_halt.c
+++ b/palacios/src/palacios/vmm_halt.c
@@ -20,14 +20,16 @@
 
 #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
 
 
+#define YIELD_TIME_USEC 1000
+
 
 //
 // This should trigger a #GP if cpl != 0, otherwise, yield to host
@@ -40,20 +42,28 @@ int v3_handle_halt(struct guest_info * info) {
     } else {
        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. */
-           v3_yield(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,YIELD_TIME_USEC);
+           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");
+               /* asm("hlt"); */
            }
+
        }
+
+       /* V3_Print("palacios: done with halt\n"); */
        
        info->rip += 1;
     }