fix barrier hang w/ unitialized secondary cores

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

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index 3e6a3f4..115e19c 100644 (file)
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -385,7 +385,12 @@ int v3_svm_load_core(struct guest_info * core, void * chkpt_ctx){
 
 
     if (core->shdw_pg_mode == SHADOW_PAGING) {
-       if (shadow_cr0->pg){
+       if (v3_get_vm_mem_mode(core) == VIRTUAL_MEM) {
+           if (v3_activate_shadow_pt(core) == -1) {
+               PrintError("Failed to activate shadow page tables\n");
+               return -1;
+           }
+       } else {
            if (v3_activate_passthrough_pt(core) == -1) {
                PrintError("Failed to activate passthrough page tables\n");
                return -1;
@@ -394,7 +399,7 @@ int v3_svm_load_core(struct guest_info * core, void * chkpt_ctx){
     }
 
 
-    v3_get_vmcb_segments((vmcb_t*)(core->vmm_data), &(core->segments));
+    v3_get_vmcb_segments((vmcb_t *)(core->vmm_data), &(core->segments));
     return 0;
 }
 #endif
@@ -695,6 +700,9 @@ int v3_start_svm_guest(struct guest_info * info) {
        }
 
        PrintDebug("SVM core %u(on %u) initialized\n", info->vcpu_id, info->pcpu_id);
+
+       // We'll be paranoid about race conditions here
+       v3_wait_at_barrier(info);
     } 
 
     PrintDebug("SVM core %u(on %u): I am starting at CS=0x%x (base=0x%p, limit=0x%x),  RIP=0x%p\n",