#include <palacios/vmm_halt.h>
#include <palacios/vmm_intr.h>
#include <palacios/vmm_lowlevel.h>
+#include <palacios/vmm_perftune.h>
#ifndef V3_CONFIG_DEBUG_HALT
#undef PrintDebug
#endif
-
//
// This should trigger a #GP if cpl != 0, otherwise, yield to host
//
-int v3_handle_halt(struct guest_info * info) {
-
+int v3_handle_halt(struct guest_info * info)
+{
+
if (info->cpl != 0) {
v3_raise_exception(info, GPF_EXCEPTION);
} else {
+ uint64_t start_cycles;
+
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_Print("palacios: halt->yield\n");
+ start_cycles = v3_get_host_time(&info->time_state);
+
+ while (!v3_intr_pending(info) && (info->vm_info->run_state == VM_RUNNING)) {
+ uint64_t t, cycles;
+
+ t = v3_get_host_time(&info->time_state);
+
+ /* Yield, allowing time to pass while yielded */
+ v3_strategy_driven_yield(info, v3_cycle_diff_in_usec(info, start_cycles, t));
+
+ cycles = v3_get_host_time(&info->time_state) - t;
+
+ v3_advance_time(info, &cycles);
- v3_yield(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
/* 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"); */