X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=115e19ca9f2f5689cb752d4ba96d3c4dd0ea0e51;hb=357fde035281e8fac28241b2f8c32d12ee3d63fb;hp=a6a6879e96f20c969422724a1bb44adfb163608d;hpb=6ee36e0a7e4585bd0e4235eeb60644fffe230af3;p=palacios.git

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index a6a6879..115e19c 100644
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -350,7 +350,7 @@ int v3_svm_save_core(struct guest_info * core, void * ctx){
     return 0;
 }
 
-int v3_svm_patch_core(struct guest_info * core, void * chkpt_ctx){
+int v3_svm_load_core(struct guest_info * core, void * chkpt_ctx){
     struct cr0_32 * shadow_cr0;
     vmcb_saved_state_t * guest_state; 
     vmcb_ctrl_t * guest_ctrl;
@@ -385,7 +385,12 @@ int v3_svm_patch_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_patch_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",