Paranoid error checking in userspace utils

[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 06b393c..60ca74b 100644 (file)
--- a/palacios/src/palacios/vmm_halt.c
+++ b/palacios/src/palacios/vmm_halt.c
@@ -28,6 +28,8 @@
 #endif
 
 
+#define YIELD_TIME_USEC 1000
+
 
 //
 // This should trigger a #GP if cpl != 0, otherwise, yield to host
@@ -40,16 +42,15 @@ 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. */
-           
+       while (!v3_intr_pending(info) && (info->vm_info->run_state == VM_RUNNING)) {
+            uint64_t t, cycles;
            /* Yield, allowing time to pass while yielded */
-           v3_yield(info);
-           v3_advance_time(info);
+           t = v3_get_host_time(&info->time_state);
+           v3_yield_timed(info,YIELD_TIME_USEC);
+           cycles = v3_get_host_time(&info->time_state) - t;
+           v3_advance_time(info, &cycles);
 
-           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