X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=580a514b2568106d902e0aa0c1270f8d3da0c0e9;hb=4a13fd6e61111133266b79ec8ff1f84258f953f4;hp=de6ee041fe4162206f16a1f685f734bb31cc3e5e;hpb=d46ec4b471af03e5e7562aeec4b26a2701671a01;p=palacios.git

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index de6ee04..580a514 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -82,7 +82,7 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) {
     }
 
     // Register all the possible device types
-    v3_init_devices();
+    V3_init_devices();
 
     // Register all shadow paging handlers
     V3_init_shdw_paging();
@@ -271,7 +271,6 @@ int v3_stop_vm(struct v3_vm_info * vm) {
 
     // force exit all cores via a cross call/IPI
 
-
     while (1) {
 	int i = 0;
 	int still_running = 0;
@@ -298,9 +297,21 @@ int v3_stop_vm(struct v3_vm_info * vm) {
 
 
 int v3_free_vm(struct v3_vm_info * vm) {
+    int i = 0;
     // deinitialize guest (free memory, etc...)
 
-    v3_dev_mgr_deinit(vm);
+    v3_free_vm_devices(vm);
+
+    for (i = 0; i < vm->num_cores; i++) {
+	// free cores
+
+	v3_free_core(&(vm->cores[i]));
+
+    }
+
+    v3_free_vm_internal(vm);
+
+    // free vm
 
     return 0;
 }