restructured device manager deinitialization

[palacios.git] / palacios / src / palacios / vm_guest.c

diff --git a/palacios/src/palacios/vm_guest.c b/palacios/src/palacios/vm_guest.c
index aa42528..92d206f 100644 (file)
--- a/palacios/src/palacios/vm_guest.c
+++ b/palacios/src/palacios/vm_guest.c
@@ -542,15 +542,15 @@ int v3_free_vm_internal(struct v3_vm_info * vm) {
 #ifdef CONFIG_SVM
        case V3_SVM_CPU:
        case V3_SVM_REV3_CPU:
-           v3_init_svm_io_map(vm);
-           v3_init_svm_msr_map(vm);
+           v3_deinit_svm_io_map(vm);
+           v3_deinit_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);
+           v3_deinit_vmx_io_map(vm);
+           v3_deinit_vmx_msr_map(vm);
            break;
 #endif
        default:
@@ -558,6 +558,8 @@ int v3_free_vm_internal(struct v3_vm_info * vm) {
            return -1;
     }
 
+    v3_deinit_dev_mgr(vm);
+
     
     return 0;
 }