X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_mem.c;h=c5000b9af2743986703d2fa9c71f00115ab32d9e;hb=8a3dbb70c29175bad79764a0b2f3961b98138bb2;hp=64c83c75d0c2cd85e41424378ce30f3c375a6b0c;hpb=559b7a07d8d5d783f0f2c2a64820ceaeda834a9e;p=palacios.git

diff --git a/palacios/src/palacios/vmm_mem.c b/palacios/src/palacios/vmm_mem.c
index 64c83c7..c5000b9 100644
--- a/palacios/src/palacios/vmm_mem.c
+++ b/palacios/src/palacios/vmm_mem.c
@@ -41,7 +41,8 @@ static int mem_offset_hypercall(struct guest_info * info, uint_t hcall_id, void
 static int unhandled_err(struct guest_info * core, addr_t guest_va, addr_t guest_pa, 
 			 struct v3_mem_region * reg, pf_error_t access_info) {
 
-    PrintError("Unhandled memory access error\n");
+    PrintError("Unhandled memory access error (gpa=%p, gva=%p, error_code=%d)\n",
+	       (void *)guest_pa, (void *)guest_va, *(uint32_t *)&access_info);
 
     v3_print_mem_map(core->vm_info);
 
@@ -65,7 +66,7 @@ int v3_init_mem_map(struct v3_vm_info * vm) {
     map->base_region.guest_start = 0;
     map->base_region.guest_end = mem_pages * PAGE_SIZE_4KB;
 
-#ifdef CONFIG_ALIGNED_PG_ALLOC
+#ifdef V3_CONFIG_ALIGNED_PG_ALLOC
     map->base_region.host_addr = (addr_t)V3_AllocAlignedPages(mem_pages, vm->mem_align);
 #else
     map->base_region.host_addr = (addr_t)V3_AllocPages(mem_pages);
@@ -301,6 +302,10 @@ static struct v3_mem_region * get_next_mem_region( struct v3_vm_info * vm, uint1
     struct v3_mem_region * reg = NULL;
     struct v3_mem_region * parent = NULL;
 
+    if (n == NULL) {
+	return NULL;
+    }
+
     while (n) {
 
 	reg = rb_entry(n, struct v3_mem_region, tree_node);
@@ -414,13 +419,13 @@ void v3_delete_mem_region(struct v3_vm_info * vm, struct v3_mem_region * reg) {
 
     v3_rb_erase(&(reg->tree_node), &(vm->mem_map.mem_regions));
 
-    V3_Free(reg);
 
 
     // If the guest isn't running then there shouldn't be anything to invalidate. 
     // Page tables should __always__ be created on demand during execution
     // NOTE: This is a sanity check, and can be removed if that assumption changes
     if (vm->run_state != VM_RUNNING) {
+	V3_Free(reg);
 	return;
     }
 
@@ -457,6 +462,8 @@ void v3_delete_mem_region(struct v3_vm_info * vm, struct v3_mem_region * reg) {
 	}
     }
 
+    V3_Free(reg);
+
     // flush virtual page tables 
     // 3 cases shadow, shadow passthrough, and nested
 
@@ -475,7 +482,7 @@ uint32_t v3_get_max_page_size(struct guest_info * core, addr_t page_addr, v3_cpu
 		pg_start = PAGE_ADDR_4MB(page_addr);
 		pg_end = (pg_start + PAGE_SIZE_4MB);
 
-		reg = get_overlapping_region(core->vm_info, core->cpu_id, pg_start, pg_end); 
+		reg = get_overlapping_region(core->vm_info, core->vcpu_id, pg_start, pg_end); 
 
 		if ((reg) && ((reg->host_addr % PAGE_SIZE_4MB) == 0)) {
 		    page_size = PAGE_SIZE_4MB;
@@ -487,7 +494,7 @@ uint32_t v3_get_max_page_size(struct guest_info * core, addr_t page_addr, v3_cpu
 		pg_start = PAGE_ADDR_2MB(page_addr);
 		pg_end = (pg_start + PAGE_SIZE_2MB);
 
-		reg = get_overlapping_region(core->vm_info, core->cpu_id, pg_start, pg_end);
+		reg = get_overlapping_region(core->vm_info, core->vcpu_id, pg_start, pg_end);
 
 		if ((reg) && ((reg->host_addr % PAGE_SIZE_2MB) == 0)) {
 		    page_size = PAGE_SIZE_2MB;
@@ -501,7 +508,7 @@ uint32_t v3_get_max_page_size(struct guest_info * core, addr_t page_addr, v3_cpu
 		pg_start = PAGE_ADDR_1GB(page_addr);
 		pg_end = (pg_start + PAGE_SIZE_1GB);
 		
-		reg = get_overlapping_region(core->vm_info, core->cpu_id, pg_start, pg_end);
+		reg = get_overlapping_region(core->vm_info, core->vcpu_id, pg_start, pg_end);
 		
 		if ((reg) && ((reg->host_addr % PAGE_SIZE_1GB) == 0)) {
 		    page_size = PAGE_SIZE_1GB;
@@ -513,7 +520,7 @@ uint32_t v3_get_max_page_size(struct guest_info * core, addr_t page_addr, v3_cpu
 		pg_start = PAGE_ADDR_2MB(page_addr);
 		pg_end = (pg_start + PAGE_SIZE_2MB);
 
-		reg = get_overlapping_region(core->vm_info, core->cpu_id, pg_start, pg_end);
+		reg = get_overlapping_region(core->vm_info, core->vcpu_id, pg_start, pg_end);
 		
 		if ((reg) && ((reg->host_addr % PAGE_SIZE_2MB) == 0)) {
 		    page_size = PAGE_SIZE_2MB;