Leave a HLT on exception injection

[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 741b2d9..7dbc8ad 100644 (file)
--- a/palacios/src/palacios/vmm_halt.c
+++ b/palacios/src/palacios/vmm_halt.c
@@ -45,7 +45,9 @@ int v3_handle_halt(struct guest_info * info)
 
        start_cycles  = v3_get_host_time(&info->time_state);
 
-       while (!v3_intr_pending(info) && (info->vm_info->run_state == VM_RUNNING)) {
+       while (!v3_intr_pending(info) &&
+              !v3_excp_pending(info) &&
+              (info->vm_info->run_state == VM_RUNNING)) {
             uint64_t t, cycles;
 
            t = v3_get_host_time(&info->time_state);
@@ -73,8 +75,8 @@ int v3_handle_halt(struct guest_info * info)
            // 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) { 
+           // stop if the VM is being halted or core is being reset
+           if (info->core_run_state == CORE_STOPPED || info->core_run_state == CORE_RESETTING) { 
                break;
            }
 
@@ -83,6 +85,11 @@ int v3_handle_halt(struct guest_info * info)
        /* V3_Print(info->vm_info, info, "palacios: done with halt\n"); */
        
        info->rip += 1;
+       
+       if (info->vcpu_id==2) { 
+         V3_Print(info->vm_info,info,"palacios: finishing halt with exppend=%d intrpend=%d\n", v3_excp_pending(info), v3_intr_pending(info));
+       }
+
     }
 
     return 0;