Enable cores to be reset via INIT IPI

[palacios.git] / palacios / src / palacios / vmx.c

diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c
index 2653af0..3a64842 100644 (file)
--- a/palacios/src/palacios/vmx.c
+++ b/palacios/src/palacios/vmx.c
@@ -1180,56 +1180,60 @@ int v3_start_vmx_guest(struct guest_info * info) {
 
     PrintDebug(info->vm_info, info, "Starting VMX core %u\n", info->vcpu_id);
 
-    if (info->vcpu_id == 0) {
-       info->core_run_state = CORE_RUNNING;
-    } else {
-
-        PrintDebug(info->vm_info, info, "VMX core %u: Waiting for core initialization\n", info->vcpu_id);
-
-        while (info->core_run_state == CORE_STOPPED) {
-
+    while (1) {
+       if (info->core_run_state == CORE_STOPPED) {
+           if (info->vcpu_id == 0) {
+               info->core_run_state = CORE_RUNNING;
+           } else {
+               
+               PrintDebug(info->vm_info, info, "VMX core %u: Waiting for core initialization\n", info->vcpu_id);
+               
+               while (info->core_run_state == CORE_STOPPED) {
+                   
+                   if (info->vm_info->run_state == VM_STOPPED) {
+                       // The VM was stopped before this core was initialized. 
+                       return 0;
+                   }
+                   
+                   v3_yield(info,-1);
+                   //PrintDebug(info->vm_info, info, "VMX core %u: still waiting for INIT\n",info->vcpu_id);
+               }
+               
+               PrintDebug(info->vm_info, info, "VMX core %u initialized\n", info->vcpu_id);
+               
+               // We'll be paranoid about race conditions here
+               v3_wait_at_barrier(info);
+           }
+           
+           
+           PrintDebug(info->vm_info, info, "VMX core %u: I am starting at CS=0x%x (base=0x%p, limit=0x%x),  RIP=0x%p\n",
+                      info->vcpu_id, info->segments.cs.selector, (void *)(info->segments.cs.base),
+                      info->segments.cs.limit, (void *)(info->rip));
+           
+           
+           PrintDebug(info->vm_info, info, "VMX core %u: Launching VMX VM on logical core %u\n", info->vcpu_id, info->pcpu_id);
+           
+           v3_start_time(info);
+           
+           
            if (info->vm_info->run_state == VM_STOPPED) {
-               // The VM was stopped before this core was initialized. 
-               return 0;
+               info->core_run_state = CORE_STOPPED;
+               break;
            }
-
-            v3_yield(info,-1);
-            //PrintDebug(info->vm_info, info, "VMX core %u: still waiting for INIT\n",info->vcpu_id);
-        }
+       }
+       
        
-       PrintDebug(info->vm_info, info, "VMX core %u initialized\n", info->vcpu_id);
-
-       // We'll be paranoid about race conditions here
-       v3_wait_at_barrier(info);
-    }
-
-
-    PrintDebug(info->vm_info, info, "VMX core %u: I am starting at CS=0x%x (base=0x%p, limit=0x%x),  RIP=0x%p\n",
-               info->vcpu_id, info->segments.cs.selector, (void *)(info->segments.cs.base),
-               info->segments.cs.limit, (void *)(info->rip));
-
-
-    PrintDebug(info->vm_info, info, "VMX core %u: Launching VMX VM on logical core %u\n", info->vcpu_id, info->pcpu_id);
-
-    v3_start_time(info);
-
 #ifdef V3_CONFIG_PMU_TELEMETRY
-    v3_pmu_telemetry_start(info);
+       v3_pmu_telemetry_start(info);
 #endif
-
+       
 #ifdef V3_CONFIG_PWRSTAT_TELEMETRY
-    v3_pwrstat_telemetry_start(info);
+       v3_pwrstat_telemetry_start(info);
 #endif
-
-    while (1) {
-
-       if (info->vm_info->run_state == VM_STOPPED) {
-           info->core_run_state = CORE_STOPPED;
-           break;
-       }
-
+       
+       
        if (v3_vmx_enter(info) == -1) {
-
+           
            addr_t host_addr;
             addr_t linear_addr = 0;