#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
if (info->cpl != 0) {
v3_raise_exception(info, GPF_EXCEPTION);
} else {
- uint64_t yield_start = 0;
-
PrintDebug("CPU Yield\n");
while (!v3_intr_pending(info)) {
- rdtscll(yield_start);
+ /* 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_time(info, yield_start - info->time_state.cached_host_tsc);
-
- rdtscll(info->time_state.cached_host_tsc);
-
+ 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;
}