Minor compile warning fixup and error checks

[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 b6e1a96..741b2d9 100644 (file)
--- a/palacios/src/palacios/vmm_halt.c
+++ b/palacios/src/palacios/vmm_halt.c
@@ -41,7 +41,7 @@ int v3_handle_halt(struct guest_info * info)
     } else {
        uint64_t start_cycles;
        
-       PrintDebug("CPU Yield\n");
+       PrintDebug(info->vm_info, info, "CPU Yield\n");
 
        start_cycles  = v3_get_host_time(&info->time_state);
 
@@ -58,6 +58,8 @@ int v3_handle_halt(struct guest_info * info)
            v3_advance_time(info, &cycles);
 
            v3_update_timers(info);
+           
+
            
            /* At this point, we either have some combination of 
               interrupts, including perhaps a timer interrupt, or 
@@ -68,9 +70,17 @@ int v3_handle_halt(struct guest_info * info)
                /* asm("hlt"); */
            }
 
+           // participate in any barrier that might be raised
+           v3_wait_at_barrier(info);
+
+           // stop if the VM is being halted
+           if (info->core_run_state == CORE_STOPPED) { 
+               break;
+           }
+
        }
 
-       /* V3_Print("palacios: done with halt\n"); */
+       /* V3_Print(info->vm_info, info, "palacios: done with halt\n"); */
        
        info->rip += 1;
     }