From: Jack Lange <jacklange@cs.pitt.edu>
Date: Mon, 19 Sep 2011 21:49:13 +0000 (-0400)
Subject: checkpoint paging fix
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=ffd7f29879c462eed95a44b5c6570644280ce388;p=palacios.git

checkpoint paging fix
---

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index 3e6a3f4..a52b4d0 100644
--- 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
diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c
index aa821da..c7c66c5 100644
--- a/palacios/src/palacios/vmx.c
+++ b/palacios/src/palacios/vmx.c
@@ -594,7 +594,12 @@ int v3_vmx_load_core(struct guest_info * core, void * ctx){
     /* Get the CPU mode to set the guest_ia32e entry ctrl */
 
     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;