X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest.c;h=1e96747ab684dda86ffa73641b97e163d5fe065c;hb=9c9370627c5a95e3abaa1b4a6b78f6f5846f53cc;hp=92d206f62756f69ecb0021d62d8fce0d97d955b4;hpb=4a13fd6e61111133266b79ec8ff1f84258f953f4;p=palacios.git

diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c
index 92d206f..1e96747 100644
--- a/palacios/src/palacios/vm_guest.c
+++ b/palacios/src/palacios/vm_guest.c
@@ -507,15 +507,15 @@ int v3_init_vm(struct v3_vm_info * vm) {
 #ifdef CONFIG_SVM
 	case V3_SVM_CPU:
 	case V3_SVM_REV3_CPU:
-	    v3_deinit_svm_io_map(vm);
-	    v3_deinit_svm_msr_map(vm);
+	    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_deinit_vmx_io_map(vm);
-	    v3_deinit_vmx_msr_map(vm);
+	    v3_init_vmx_io_map(vm);
+	    v3_init_vmx_msr_map(vm);
 	    break;
 #endif
 	default:
@@ -537,6 +537,11 @@ int v3_free_vm_internal(struct v3_vm_info * vm) {
     v3_remove_hypercall(vm, GUEST_INFO_HCALL);
 
 
+
+#ifdef CONFIG_SYMBIOTIC
+    v3_deinit_symbiotic_vm(vm);
+#endif
+
     // init SVM/VMX
     switch (cpu_type) {
 #ifdef CONFIG_SVM
@@ -560,7 +565,26 @@ int v3_free_vm_internal(struct v3_vm_info * vm) {
 
     v3_deinit_dev_mgr(vm);
 
-    
+    v3_deinit_time_vm(vm);
+
+    v3_deinit_mem_hooks(vm);
+    v3_delete_mem_map(vm);
+    v3_deinit_shdw_impl(vm);
+
+    v3_deinit_intr_routers(vm);
+    v3_deinit_host_events(vm);
+
+    v3_deinit_cpuid_map(vm);
+    v3_deinit_msr_map(vm);
+    v3_deinit_io_map(vm);
+    v3_deinit_hypercall_map(vm);
+
+#ifdef CONFIG_TELEMETRY
+    v3_deinit_telemetry(vm);
+#endif
+
+
+
     return 0;
 }
 
@@ -628,7 +652,7 @@ int v3_free_core(struct guest_info * core) {
 
     
 #ifdef CONFIG_SYMBIOTIC
-    //v3_deinit_symbiotic_core(core);
+    v3_deinit_symbiotic_core(core);
 #endif
 
     v3_deinit_decoder(core);
@@ -642,6 +666,10 @@ int v3_free_core(struct guest_info * core) {
 
     v3_free_passthrough_pts(core);
 
+#ifdef CONFIG_TELEMETRY
+    v3_deinit_core_telemetry(core);
+#endif
+
     switch (cpu_type) {
 #ifdef CONFIG_SVM
 	case V3_SVM_CPU: