X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_mem.c;h=9cf6ea1f342d5ea9b6912025f32178a0df05823f;hb=b58fe2254858e3ecc94be5d86f2a93f2cfe0a0d5;hp=a074bfc392da6ca75aad44d4befa1c6eb0cf41eb;hpb=a48fed88738b625fea8a606f5b327d32db91f009;p=palacios.git

diff --git a/palacios/src/palacios/vmm_mem.c b/palacios/src/palacios/vmm_mem.c
index a074bfc..9cf6ea1 100644
--- a/palacios/src/palacios/vmm_mem.c
+++ b/palacios/src/palacios/vmm_mem.c
@@ -185,12 +185,11 @@ int v3_init_mem_map(struct v3_vm_info * vm) {
     PrintDebug(VM_NONE, VCORE_NONE, "v3_init_mem_map: %llu base regions will be allocated of %llu base regions in guest\n",
 	       (uint64_t)num_base_regions_host_mem, (uint64_t)map->num_base_regions);
     
-    map->base_regions = V3_AllocPages(CEIL_DIV(sizeof(struct v3_mem_region) * map->num_base_regions, PAGE_SIZE_4KB));
+    map->base_regions = V3_VMalloc(sizeof(struct v3_mem_region) * map->num_base_regions);
     if (map->base_regions == NULL) {
 	PrintError(vm, VCORE_NONE, "Could not allocate base region array\n");
 	return -1;
     }
-    map->base_regions = V3_VAddr(map->base_regions);
 
     memset(map->base_regions, 0, sizeof(struct v3_mem_region) * map->num_base_regions);
 
@@ -222,7 +221,7 @@ int v3_init_mem_map(struct v3_vm_info * vm) {
 	    region->host_addr = (addr_t)V3_AllocPagesExtended(block_pages,
 							      PAGE_SIZE_4KB,
 							      node_id,
-							      0); // no constraints 
+							      0, 0); // no constraints 
 	    
 	    if ((void *)region->host_addr == NULL) { 
 		PrintError(vm, VCORE_NONE, "Could not allocate guest memory\n");
@@ -297,8 +296,7 @@ void v3_delete_mem_map(struct v3_vm_info * vm) {
 #endif
     }
 
-    V3_FreePages(V3_PAddr(map->base_regions),
-		 CEIL_DIV(sizeof(struct v3_mem_region) * map->num_base_regions, PAGE_SIZE_4KB));
+    V3_VFree(map->base_regions);
 }