X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_checkpoint.c;h=5ba96ac891d6303aabf60f4bcb057efdc2790d4b;hb=8340fc900a69b5e4093ae77e0984c12f157dca28;hp=fbe922de75442585d183e5d013d5c2e5dae39df8;hpb=5d1bbcc86de011e3f0d115b6f10fd8645cdf855e;p=palacios.git

diff --git a/palacios/src/palacios/vmm_checkpoint.c b/palacios/src/palacios/vmm_checkpoint.c
index fbe922d..5ba96ac 100644
--- a/palacios/src/palacios/vmm_checkpoint.c
+++ b/palacios/src/palacios/vmm_checkpoint.c
@@ -26,6 +26,7 @@
 #include <palacios/vmx.h>
 #include <palacios/vmm_checkpoint.h>
 #include <palacios/vmm_hashtable.h>
+#include <palacios/vmm_direct_paging.h>
 
 #include <palacios/vmm_dev_mgr.h>
 
@@ -236,12 +237,12 @@ static int save_memory(struct v3_vm_info * vm, struct v3_chkpt * chkpt) {
 }
 
 int save_header(struct v3_vm_info * vm, struct v3_chkpt * chkpt) {
-    v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU());
+    extern v3_cpu_arch_t v3_mach_type;
     void * ctx = NULL;
     
     ctx = v3_chkpt_open_ctx(chkpt, NULL, "header");
 
-    switch (cpu_type) {
+    switch (v3_mach_type) {
 	case V3_SVM_CPU:
 	case V3_SVM_REV3_CPU: {
 	    v3_chkpt_save(ctx, "header", strlen(svm_chkpt_header), svm_chkpt_header);
@@ -265,12 +266,12 @@ int save_header(struct v3_vm_info * vm, struct v3_chkpt * chkpt) {
 }
 
 static int load_header(struct v3_vm_info * vm, struct v3_chkpt * chkpt) {
-    v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU());
+    extern v3_cpu_arch_t v3_mach_type;
     void * ctx = NULL;
     
     ctx = v3_chkpt_open_ctx(chkpt, NULL, "header");
 
-    switch (cpu_type) {
+    switch (v3_mach_type) {
 	case V3_SVM_CPU:
 	case V3_SVM_REV3_CPU: {
 	    char header[strlen(svm_chkpt_header) + 1];
@@ -301,7 +302,7 @@ static int load_header(struct v3_vm_info * vm, struct v3_chkpt * chkpt) {
 
 
 static int load_core(struct guest_info * info, struct v3_chkpt * chkpt) {
-    v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU());
+    extern v3_cpu_arch_t v3_mach_type;
     void * ctx = NULL;
     char key_name[16];
     memset(key_name, 0, 16);
@@ -310,6 +311,8 @@ static int load_core(struct guest_info * info, struct v3_chkpt * chkpt) {
 
     ctx = v3_chkpt_open_ctx(chkpt, NULL, key_name);
 
+    v3_chkpt_load_64(ctx, "RIP", &(info->rip));
+
     V3_CHKPT_STD_LOAD(ctx, info->vm_regs);
 
     V3_CHKPT_STD_LOAD(ctx, info->ctrl_regs.cr0);
@@ -331,8 +334,22 @@ static int load_core(struct guest_info * info, struct v3_chkpt * chkpt) {
     info->cpu_mode = v3_get_vm_cpu_mode(info);
     info->mem_mode = v3_get_vm_mem_mode(info);
 
+    if (info->shdw_pg_mode == SHADOW_PAGING) {
+	if (v3_get_vm_mem_mode(info) == VIRTUAL_MEM) {
+	    if (v3_activate_shadow_pt(info) == -1) {
+		PrintError("Failed to activate shadow page tables\n");
+		return -1;
+	    }
+	} else {
+	    if (v3_activate_passthrough_pt(info) == -1) {
+		PrintError("Failed to activate passthrough page tables\n");
+		return -1;
+	    }
+	}
+    }
+
 
-    switch (cpu_type) {
+    switch (v3_mach_type) {
 	case V3_SVM_CPU:
 	case V3_SVM_REV3_CPU: {
 	    char key_name[16];
@@ -367,26 +384,32 @@ static int load_core(struct guest_info * info, struct v3_chkpt * chkpt) {
 	    break;
 	}
 	default:
-	    PrintError("Invalid CPU Type (%d)\n", cpu_type);
+	    PrintError("Invalid CPU Type (%d)\n", v3_mach_type);
 	    return -1;
     }
 
+    v3_print_guest_state(info);
+
     return 0;
 }
 
 
 static int save_core(struct guest_info * info, struct v3_chkpt * chkpt) {
-    v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU());
+    extern v3_cpu_arch_t v3_mach_type;
     void * ctx = NULL;
     char key_name[16];
 
     memset(key_name, 0, 16);
 
+    v3_print_guest_state(info);
+
 
     snprintf(key_name, 16, "guest_info%d", info->vcpu_id);
 
     ctx = v3_chkpt_open_ctx(chkpt, NULL, key_name);
 
+    v3_chkpt_save_64(ctx, "RIP", &(info->rip));
+
     V3_CHKPT_STD_SAVE(ctx, info->vm_regs);
 
     V3_CHKPT_STD_SAVE(ctx, info->ctrl_regs.cr0);
@@ -405,7 +428,7 @@ static int save_core(struct guest_info * info, struct v3_chkpt * chkpt) {
     v3_chkpt_close_ctx(ctx);
 
     //Architechture specific code
-    switch (cpu_type) {
+    switch (v3_mach_type) {
 	case V3_SVM_CPU:
 	case V3_SVM_REV3_CPU: {
 	    char key_name[16];
@@ -445,7 +468,7 @@ static int save_core(struct guest_info * info, struct v3_chkpt * chkpt) {
 	    break;
 	}
 	default:
-	    PrintError("Invalid CPU Type (%d)\n", cpu_type);
+	    PrintError("Invalid CPU Type (%d)\n", v3_mach_type);
 	    return -1;
     }
     
@@ -475,12 +498,12 @@ int v3_chkpt_save_vm(struct v3_vm_info * vm, char * store, char * url) {
 	goto out;
     }
     
-    /*
-    if ((ret = v3_chkpt_save_dev(vm)) == -1) {
+    
+    if ((ret = v3_save_vm_devices(vm, chkpt)) == -1) {
 	PrintError("Unable to save devices\n");
 	goto out;
     }
-    */
+    
 
     if ((ret = save_header(vm, chkpt)) == -1) {
 	PrintError("Unable to save header\n");
@@ -530,12 +553,11 @@ int v3_chkpt_load_vm(struct v3_vm_info * vm, char * store, char * url) {
     }
 
 
-    /* Don't handle devices just yet
-    if (v3_chkpt_load_dev(vm) == -1) {
+    if ((ret = v3_load_vm_devices(vm, chkpt)) == -1) {
 	PrintError("Unable to load devies\n");
+	goto out;
     }
 
-    */
 
     if ((ret = load_header(vm, chkpt)) == -1) {
 	PrintError("Unable to load header\n");
@@ -550,7 +572,7 @@ int v3_chkpt_load_vm(struct v3_vm_info * vm, char * store, char * url) {
 	}
     }
 
- out:     
+ out:
 
     /* Resume the guest if it was running and we didn't just trash the state*/
     if (vm->run_state == VM_RUNNING) {