X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_mem.c;fp=palacios%2Fsrc%2Fpalacios%2Fvmm_mem.c;h=c45f18d043a166435c1dea29c176a4bcb48cd534;hb=8ad176c4dd55a8b32097d8da4f661ba2fd10ace2;hp=3ebb0417eecd55d1cf4c0de80fd94b4d3917af35;hpb=1242db041374fb8d6d09e692b6ab95f7b86319ac;p=palacios-OLD.git

diff --git a/palacios/src/palacios/vmm_mem.c b/palacios/src/palacios/vmm_mem.c
index 3ebb041..c45f18d 100644
--- a/palacios/src/palacios/vmm_mem.c
+++ b/palacios/src/palacios/vmm_mem.c
@@ -50,44 +50,23 @@ static int unhandled_err(struct guest_info * core, addr_t guest_va, addr_t guest
     return -1;
 }
 
-
-static inline uint32_t get_alignment(char * align_str) {
-    if (align_str != NULL) {
-	if (strncasecmp(align_str, "2MB", strlen("2MB")) == 0) {
-	    return PAGE_SIZE_2MB;
-	} else if (strncasecmp(align_str, "4MB", strlen("4MB")) == 0) {
-	    return PAGE_SIZE_4MB;
-	}
-    }
-    
-    // default is 4KB alignment
-    return PAGE_SIZE_4KB;
-}
-
 int v3_init_mem_map(struct v3_vm_info * vm) {
     struct v3_mem_map * map = &(vm->mem_map);
-    v3_cfg_tree_t * pg_cfg = v3_cfg_subtree(vm->cfg_data->cfg, "memory");
-    uint32_t alignment = get_alignment(v3_cfg_val(pg_cfg, "alignment"));
     addr_t mem_pages = vm->mem_size >> 12;
 
     memset(&(map->base_region), 0, sizeof(struct v3_mem_region));
 
     map->mem_regions.rb_node = NULL;
 
-
     // There is an underlying region that contains all of the guest memory
     // PrintDebug("Mapping %d pages of memory (%u bytes)\n", (int)mem_pages, (uint_t)info->mem_size);
 
     map->base_region.guest_start = 0;
     map->base_region.guest_end = mem_pages * PAGE_SIZE_4KB;
 
-#ifdef ALIGNED_PG_ALLOC
-    map->base_region.host_addr = (addr_t)V3_AllocAlignedPages(mem_pages, alignment);
+#ifdef CONFIG_ALIGNED_PG_ALLOC
+    map->base_region.host_addr = (addr_t)V3_AllocAlignedPages(mem_pages, vm->mem_align);
 #else
-    if (alignment != PAGE_SIZE_4KB) {
-	PrintError("Aligned page allocations are not supported in this host (requested alignment=%d)\n", alignment);
-	PrintError("Ignoring alignment request\n");
-    }
     map->base_region.host_addr = (addr_t)V3_AllocPages(mem_pages);
 #endif