X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fmmu%2Fvmm_shdw_pg_tlb.c;h=60b2d214c80a713b5b5e8744c1686660526dc3a0;hb=3ba2f5222dcea4ec984984f72455a172ec7707bd;hp=050d6e7db72b40585866ae3f2d7950ccd201099c;hpb=fb16ffd793b51e356bd17a35b3929adbadd88e23;p=palacios.git

diff --git a/palacios/src/palacios/mmu/vmm_shdw_pg_tlb.c b/palacios/src/palacios/mmu/vmm_shdw_pg_tlb.c
index 050d6e7..60b2d21 100644
--- a/palacios/src/palacios/mmu/vmm_shdw_pg_tlb.c
+++ b/palacios/src/palacios/mmu/vmm_shdw_pg_tlb.c
@@ -24,7 +24,7 @@
 #include <palacios/vm_guest_mem.h>
 
 
-#ifndef CONFIG_DEBUG_SHDW_PG_VTLB
+#ifndef V3_CONFIG_DEBUG_SHDW_PG_VTLB
 #undef PrintDebug
 #define PrintDebug(fmt, ...)
 #endif
@@ -106,7 +106,7 @@ static int vtlb_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 }
 
 static int vtlb_deinit(struct v3_vm_info * vm) {
-    return -1;
+    return 0;
 }
 
 static int vtlb_local_init(struct guest_info * core) {
@@ -115,7 +115,6 @@ static int vtlb_local_init(struct guest_info * core) {
 
     V3_Print("VTLB local initialization\n");
 
-
     vtlb_state = (struct vtlb_local_state *)V3_Malloc(sizeof(struct vtlb_local_state));
 
     INIT_LIST_HEAD(&(vtlb_state->page_list));
@@ -126,6 +125,27 @@ static int vtlb_local_init(struct guest_info * core) {
 }
 
 
+static int vtlb_local_deinit(struct guest_info * core) {
+    struct v3_shdw_pg_state * state = &(core->shdw_pg_state);
+    struct vtlb_local_state * vtlb_state = state->local_impl_data;
+
+    struct shadow_page_data * shdw_pg = NULL;
+    struct shadow_page_data * tmp = NULL;
+
+    // free page list...
+    list_for_each_entry_safe(shdw_pg, tmp, &(vtlb_state->page_list), page_list_node) {
+	list_del(&(shdw_pg->page_list_node));
+	V3_FreePages((void *)shdw_pg->page_pa, 1);
+	V3_Free(shdw_pg);
+    }
+
+
+    V3_Free(vtlb_state);
+
+    return 0;
+}
+
+
 static int vtlb_activate_shdw_pt(struct guest_info * core) {
     switch (v3_get_vm_cpu_mode(core)) {
 
@@ -192,6 +212,7 @@ static struct v3_shdw_pg_impl vtlb_impl =  {
     .init = vtlb_init,
     .deinit = vtlb_deinit,
     .local_init = vtlb_local_init,
+    .local_deinit = vtlb_local_deinit,
     .handle_pagefault = vtlb_handle_pf,
     .handle_invlpg = vtlb_handle_invlpg,
     .activate_shdw_pt = vtlb_activate_shdw_pt,