X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest.c;h=aa425280982ff767d29f169f5b1e7fb8c594d6b1;hb=c31bb26014522e5678e9c9dcc9eda760eeb5907a;hp=e9ff5f7178761c8be57dfaf89667f00405a08457;hpb=7043e3314c5843994dbd6615aca71b0378950b3e;p=palacios-OLD.git

diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c
index e9ff5f7..aa42528 100644
--- a/palacios/src/palacios/vm_guest.c
+++ b/palacios/src/palacios/vm_guest.c
@@ -30,6 +30,8 @@
 #include <palacios/vmm_sprintf.h>
 #include <palacios/vmm_muxer.h>
 #include <palacios/vmm_xed.h>
+#include <palacios/vmm_direct_paging.h>
+
 
 
 v3_cpu_mode_t v3_get_vm_cpu_mode(struct guest_info * info) {
@@ -383,7 +385,7 @@ void v3_print_GPRs(struct guest_info * info) {
     v3_reg_t * reg_ptr;
     char * reg_names[] = { "RDI", "RSI", "RBP", "RSP", "RBX", "RDX", "RCX", "RAX", NULL};
 
-    reg_ptr= (v3_reg_t *)regs;
+    reg_ptr = (v3_reg_t *)regs;
 
     V3_Print("32 bit GPRs:\n");
 
@@ -460,7 +462,6 @@ static int info_hcall(struct guest_info * core, uint_t hcall_id, void * priv_dat
 
 int v3_init_vm(struct v3_vm_info * vm) {
     v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU());
-    int cpu_valid = 0;
 
     if (v3_get_foreground_vm() == NULL) {
 	v3_set_foreground_vm(vm);
@@ -491,6 +492,8 @@ int v3_init_vm(struct v3_vm_info * vm) {
     }
 
 
+    v3_init_time_vm(vm);
+
 
 #ifdef CONFIG_SYMBIOTIC
     v3_init_symbiotic_vm(vm);
@@ -500,23 +503,24 @@ int v3_init_vm(struct v3_vm_info * vm) {
 
 
     // init SVM/VMX
+    switch (cpu_type) {
 #ifdef CONFIG_SVM
-    if ((cpu_type == V3_SVM_CPU) || (cpu_type == V3_SVM_REV3_CPU)) {
-	v3_init_svm_io_map(vm);
-	v3_init_svm_msr_map(vm);
-	cpu_valid = 1;
-    } 
+	case V3_SVM_CPU:
+	case V3_SVM_REV3_CPU:
+	    v3_deinit_svm_io_map(vm);
+	    v3_deinit_svm_msr_map(vm);
+	    break;
 #endif
 #ifdef CONFIG_VMX
-    if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) {
-	v3_init_vmx_io_map(vm);
-	v3_init_vmx_msr_map(vm);
-	cpu_valid = 1;
-    }
+	case V3_VMX_CPU:
+	case V3_VMX_EPT_CPU:
+	    v3_deinit_vmx_io_map(vm);
+	    v3_deinit_vmx_msr_map(vm);
+	    break;
 #endif
-    if (!cpu_valid) {
-	PrintError("Invalid CPU Type 0x%x\n", cpu_type);
-	return -1;
+	default:
+	    PrintError("Invalid CPU Type 0x%x\n", cpu_type);
+	    return -1;
     }
     
     v3_register_hypercall(vm, GUEST_INFO_HCALL, info_hcall, NULL);
@@ -526,6 +530,39 @@ int v3_init_vm(struct v3_vm_info * vm) {
     return 0;
 }
 
+
+int v3_free_vm_internal(struct v3_vm_info * vm) {
+    v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU());
+
+    v3_remove_hypercall(vm, GUEST_INFO_HCALL);
+
+
+    // init SVM/VMX
+    switch (cpu_type) {
+#ifdef CONFIG_SVM
+	case V3_SVM_CPU:
+	case V3_SVM_REV3_CPU:
+	    v3_init_svm_io_map(vm);
+	    v3_init_svm_msr_map(vm);
+	    break;
+#endif
+#ifdef CONFIG_VMX
+	case V3_VMX_CPU:
+	case V3_VMX_EPT_CPU:
+	    v3_init_vmx_io_map(vm);
+	    v3_init_vmx_msr_map(vm);
+	    break;
+#endif
+	default:
+	    PrintError("Invalid CPU Type 0x%x\n", cpu_type);
+	    return -1;
+    }
+
+    
+    return 0;
+}
+
+
 int v3_init_core(struct guest_info * core) {
     v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU());
     struct v3_vm_info * vm = core->vm_info;
@@ -541,7 +578,7 @@ int v3_init_core(struct guest_info * core) {
 	v3_init_shdw_pg_state(core);
     }
 
-    v3_init_time(core);
+    v3_init_time_core(core);
     v3_init_intr_controllers(core);
     v3_init_exception_state(core);
 
@@ -581,3 +618,54 @@ int v3_init_core(struct guest_info * core) {
 
     return 0;
 }
+
+
+
+int v3_free_core(struct guest_info * core) {
+    v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU());
+
+    
+#ifdef CONFIG_SYMBIOTIC
+    //v3_deinit_symbiotic_core(core);
+#endif
+
+    v3_deinit_decoder(core);
+
+    v3_deinit_intr_controllers(core);
+    v3_deinit_time_core(core);
+
+    if (core->shdw_pg_mode == SHADOW_PAGING) {
+	v3_deinit_shdw_pg_state(core);
+    }
+
+    v3_free_passthrough_pts(core);
+
+    switch (cpu_type) {
+#ifdef CONFIG_SVM
+	case V3_SVM_CPU:
+	case V3_SVM_REV3_CPU:
+	    if (v3_deinit_svm_vmcb(core) == -1) {
+		PrintError("Error in SVM initialization\n");
+		return -1;
+	    }
+	    break;
+#endif
+#ifdef CONFIG_VMX
+	case V3_VMX_CPU:
+	case V3_VMX_EPT_CPU:
+	    if (v3_deinit_vmx_vmcs(core) == -1) {
+		PrintError("Error in VMX initialization\n");
+		return -1;
+	    }
+	    break;
+#endif
+	default:
+	    PrintError("Invalid CPU Type 0x%x\n", cpu_type);
+	    return -1;
+    }
+
+    return 0;
+}
+
+
+