Merge branch 'devel' of ssh://newskysaw.cs.northwestern.edu/home/palacios/palacios...

[palacios.git] / palacios / src / palacios / mmu / vmm_shdw_pg_kvm.c

diff --git a/palacios/src/palacios/mmu/vmm_shdw_pg_kvm.c b/palacios/src/palacios/mmu/vmm_shdw_pg_kvm.c
index decf6b9..c955790 100644 (file)
--- a/palacios/src/palacios/mmu/vmm_shdw_pg_kvm.c
+++ b/palacios/src/palacios/mmu/vmm_shdw_pg_kvm.c
@@ -12,12 +12,12 @@
 #include <palacios/vmm_paging.h>
 
 
-#ifndef CONFIG_DEBUG_SHDW_CACHE
+#ifndef V3_CONFIG_DEBUG_SHDW_CACHE
 #undef PrintDebug
 #define PrintDebug(fmt, ...)
 #endif
 
-#ifdef CONFIG_SHADOW_CACHE
+#ifdef V3_CONFIG_SHADOW_CACHE
 
 struct pde_chain {
     addr_t shadow_pdes[NR_PTE_CHAIN_ENTRIES];
@@ -116,7 +116,7 @@ static void shadow_free_page (struct guest_info * core, struct shadow_page_cache
 {
     list_del(&page->link);
 
-    V3_FreePage((void *)page->page_pa);
+    V3_FreePages((void *)page->page_pa, 1);
     page->page_pa=(addr_t)V3_AllocPages(1);
        
     list_add(&page->link,&core->free_pages);
@@ -163,7 +163,7 @@ static void free_shadow_pages(struct guest_info * core)
     while (!list_empty(&core->free_pages)) {
        page = list_entry(core->free_pages.next, struct shadow_page_cache_data, link);
        list_del(&page->link);
-       V3_FreePage((void *)page->page_pa);
+       V3_FreePages((void *)page->page_pa, 1);
        page->page_pa = ~(addr_t)0; //invalid address
     }
 }