Initial support for moving virtual cores among different physical CPUs

[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..58a0374 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
@@ -42,18 +42,32 @@ int v3_handle_halt(struct guest_info * info) {
 
        while (!v3_intr_pending(info)) {
            /* Since we're in an exit, time is already paused here, so no need to pause again. */
+         //        V3_Print("palacios: halt->yield\n");
+
            v3_yield(info);
-           v3_update_timers(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"); */
+           }
+
+          /* check if there is a core move request pending 
+            * if there is, resume the guest with RIP on halt instruction again
+            */
+           if (info->core_move_state == CORE_MOVE_PENDING){
+               return 0;
            }
        }
+
+       /* V3_Print("palacios: done with halt\n"); */
        
        info->rip += 1;
     }