X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_mem.c;h=c5000b9af2743986703d2fa9c71f00115ab32d9e;hb=5e5c8ee949fa45116d58b904fc11aab082f61607;hp=cb5993a71a0347f9bdb7c6f5b8adad5393074735;hpb=94f67717b6461df514dc225ed84f03b44c44061b;p=palacios.git

diff --git a/palacios/src/palacios/vmm_mem.c b/palacios/src/palacios/vmm_mem.c
index cb5993a..c5000b9 100644
--- a/palacios/src/palacios/vmm_mem.c
+++ b/palacios/src/palacios/vmm_mem.c
@@ -302,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);
@@ -478,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;
@@ -490,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;
@@ -504,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;
@@ -516,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;