Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


Split telemetry into global and per-core to avoid race printing core telemetry
[palacios.git] / palacios / src / palacios / vmm_halt.c
index fc6d3d5..bfe2e5a 100644 (file)
@@ -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
@@ -42,18 +42,26 @@ 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"); */
            }
+
        }
+
+       /* V3_Print("palacios: done with halt\n"); */
        
        info->rip += 1;
     }