X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest.c;h=a12c76497fb8279e35c81e34eba77b1f4ab602da;hb=a4fd5bcc79e7cdf9a3bd879294566bff0666ced7;hp=dc47a46607c0376147250e31a7bed70fa698e8ae;hpb=3751dffc4cb29c0db743895f7b507862db1a675d;p=palacios.git

diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c
index dc47a46..a12c764 100644
--- a/palacios/src/palacios/vm_guest.c
+++ b/palacios/src/palacios/vm_guest.c
@@ -37,19 +37,20 @@
 v3_cpu_mode_t v3_get_vm_cpu_mode(struct guest_info * info) {
     struct cr0_32 * cr0;
     struct efer_64 * efer;
-    struct cr4_32 * cr4 = (struct cr4_32 *)&(info->ctrl_regs.cr4);
     struct v3_segment * cs = &(info->segments.cs);
-
+    struct cr4_32 * cr4;
 
     if (info->shdw_pg_mode == SHADOW_PAGING) {
 	cr0 = (struct cr0_32 *)&(info->shdw_pg_state.guest_cr0);
 	efer = (struct efer_64 *)&(info->shdw_pg_state.guest_efer);
+        cr4 = (struct cr4_32 *)&(info->shdw_pg_state.guest_cr4);
     } else if (info->shdw_pg_mode == NESTED_PAGING) {
 	cr0 = (struct cr0_32 *)&(info->ctrl_regs.cr0);
 	efer = (struct efer_64 *)&(info->ctrl_regs.efer);
+        cr4 = (struct cr4_32 *)&(info->ctrl_regs.cr4);
     } else {
-	PrintError("Invalid Paging Mode...\n");
-	V3_ASSERT(0);
+        PrintError(info->vm_info, info, "Invalid Paging Mode...\n");
+	V3_ASSERT(info->vm_info, info, 0);
 	return -1;
     }
 
@@ -82,8 +83,8 @@ uint_t v3_get_addr_width(struct guest_info * info) {
 	cr0 = (struct cr0_32 *)&(info->ctrl_regs.cr0);
 	efer = (struct efer_64 *)&(info->ctrl_regs.efer);
     } else {
-	PrintError("Invalid Paging Mode...\n");
-	V3_ASSERT(0);
+        PrintError(info->vm_info, info, "Invalid Paging Mode...\n");
+	V3_ASSERT(info->vm_info, info, 0);
 	return -1;
     }
 
@@ -136,8 +137,8 @@ v3_mem_mode_t v3_get_vm_mem_mode(struct guest_info * info) {
     } else if (info->shdw_pg_mode == NESTED_PAGING) {
 	cr0 = (struct cr0_32 *)&(info->ctrl_regs.cr0);
     } else {
-	PrintError("Invalid Paging Mode...\n");
-	V3_ASSERT(0);
+	PrintError(info->vm_info, info, "Invalid Paging Mode...\n");
+	V3_ASSERT(info->vm_info, info, 0);
 	return -1;
     }
 
@@ -174,7 +175,7 @@ static int info_hcall(struct guest_info * core, uint_t hcall_id, void * priv_dat
     extern v3_cpu_arch_t v3_mach_type;
     int cpu_valid = 0;
 
-    V3_Print("************** Guest State ************\n");
+    V3_Print(core->vm_info, core, "************** Guest State ************\n");
     v3_print_guest_state(core);
     
     // init SVM/VMX
@@ -191,7 +192,7 @@ static int info_hcall(struct guest_info * core, uint_t hcall_id, void * priv_dat
     }
 #endif
     if (!cpu_valid) {
-	PrintError("Invalid CPU Type 0x%x\n", v3_mach_type);
+	PrintError(core->vm_info, core, "Invalid CPU Type 0x%x\n", v3_mach_type);
 	return -1;
     }
     
@@ -238,17 +239,26 @@ int v3_init_vm(struct v3_vm_info * vm) {
 
     // Initialize the memory map
     if (v3_init_mem_map(vm) == -1) {
-	PrintError("Could not initialize shadow map\n");
+        PrintError(vm, VCORE_NONE, "Could not initialize shadow map\n");
 	return -1;
     }
 
     v3_init_mem_hooks(vm);
 
     if (v3_init_shdw_impl(vm) == -1) {
-	PrintError("VM initialization error in shadow implementaion\n");
+        PrintError(vm, VCORE_NONE, "VM initialization error in shadow implementaion\n");
 	return -1;
     }
 
+    if (v3_init_passthrough_paging(vm) == -1) {
+        PrintError(vm, VCORE_NONE, "VM initialization error in passthrough paging\n");
+	return -1;
+    }
+
+    if (v3_init_nested_paging(vm) == -1) {
+        PrintError(vm, VCORE_NONE, "VM initialization error in nested paging\n");
+	return -1;
+    }
 
     v3_init_time_vm(vm);
 
@@ -282,13 +292,13 @@ int v3_init_vm(struct v3_vm_info * vm) {
 	    break;
 #endif
 	default:
-	    PrintError("Invalid CPU Type 0x%x\n", v3_mach_type);
+   	    PrintError(vm, VCORE_NONE, "Invalid CPU Type 0x%x\n", v3_mach_type);
 	    return -1;
     }
     
     v3_register_hypercall(vm, GUEST_INFO_HCALL, info_hcall, NULL);
 
-    V3_Print("GUEST_INFO_HCALL=%x\n", GUEST_INFO_HCALL);
+    V3_Print(vm, VCORE_NONE, "GUEST_INFO_HCALL=%x\n", GUEST_INFO_HCALL);
 
     return 0;
 }
@@ -323,7 +333,7 @@ int v3_free_vm_internal(struct v3_vm_info * vm) {
 	    break;
 #endif
 	default:
-	    PrintError("Invalid CPU Type 0x%x\n", v3_mach_type);
+  	    PrintError(vm, VCORE_NONE, "Invalid CPU Type 0x%x\n", v3_mach_type);
 	    return -1;
     }
 
@@ -334,6 +344,8 @@ int v3_free_vm_internal(struct v3_vm_info * vm) {
     v3_deinit_mem_hooks(vm);
     v3_delete_mem_map(vm);
     v3_deinit_shdw_impl(vm);
+    v3_deinit_passthrough_paging(vm);
+    v3_deinit_nested_paging(vm);
 
     v3_deinit_ext_manager(vm);
     v3_deinit_intr_routers(vm);
@@ -354,6 +366,8 @@ int v3_free_vm_internal(struct v3_vm_info * vm) {
 
     v3_deinit_events(vm);
 
+    v3_fw_cfg_deinit(vm);
+
 
     return 0;
 }
@@ -373,7 +387,11 @@ int v3_init_core(struct guest_info * core) {
 #endif
 
     if (core->shdw_pg_mode == SHADOW_PAGING) {
+        v3_init_passthrough_paging_core(core);
 	v3_init_shdw_pg_state(core);
+    } else {
+        //done later due to SVM/VMX differences 
+        //v3_init_nested_paging_core(core);
     }
 
     v3_init_time_core(core);
@@ -395,7 +413,7 @@ int v3_init_core(struct guest_info * core) {
 	case V3_SVM_CPU:
 	case V3_SVM_REV3_CPU:
 	    if (v3_init_svm_vmcb(core, vm->vm_class) == -1) {
-		PrintError("Error in SVM initialization\n");
+	        PrintError(vm, core, "Error in SVM initialization\n");
 		return -1;
 	    }
 	    break;
@@ -405,13 +423,13 @@ int v3_init_core(struct guest_info * core) {
 	case V3_VMX_EPT_CPU:
 	case V3_VMX_EPT_UG_CPU:
 	    if (v3_init_vmx_vmcs(core, vm->vm_class) == -1) {
-		PrintError("Error in VMX initialization\n");
+  	        PrintError(vm, core, "Error in VMX initialization\n");
 		return -1;
 	    }
 	    break;
 #endif
 	default:
-	    PrintError("Invalid CPU Type 0x%x\n", v3_mach_type);
+            PrintError(vm, core, "Invalid CPU Type 0x%x\n", v3_mach_type);
 	    return -1;
     }
     
@@ -438,6 +456,9 @@ int v3_free_core(struct guest_info * core) {
 
     if (core->shdw_pg_mode == SHADOW_PAGING) {
 	v3_deinit_shdw_pg_state(core);
+        v3_deinit_passthrough_paging_core(core);
+   } else {
+        v3_deinit_nested_paging_core(core);
     }
 
     v3_free_passthrough_pts(core);
@@ -451,7 +472,7 @@ int v3_free_core(struct guest_info * core) {
 	case V3_SVM_CPU:
 	case V3_SVM_REV3_CPU:
 	    if (v3_deinit_svm_vmcb(core) == -1) {
-		PrintError("Error in SVM initialization\n");
+  	        PrintError(VM_NONE,VCORE_NONE, "Error in SVM deinitialization\n");
 		return -1;
 	    }
 	    break;
@@ -461,13 +482,13 @@ int v3_free_core(struct guest_info * core) {
 	case V3_VMX_EPT_CPU:
 	case V3_VMX_EPT_UG_CPU:
 	    if (v3_deinit_vmx_vmcs(core) == -1) {
-		PrintError("Error in VMX initialization\n");
+	        PrintError(VM_NONE, VCORE_NONE, "Error in VMX initialization\n");
 		return -1;
 	    }
 	    break;
 #endif
 	default:
-	    PrintError("Invalid CPU Type 0x%x\n", v3_mach_type);
+  	    PrintError(core->vm_info, core, "Invalid CPU Type 0x%x\n", v3_mach_type);
 	    return -1;
     }