X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_mem.c;h=390de616db8317747748076d328930281ca948b4;hb=d597d493eb303496f3bb32e2a73a094a8a20a022;hp=ee998117e73c8f7bf7486ddd6c087b20121326e1;hpb=e784113618800cede961f9a86084a96d20179e1c;p=palacios.releases.git

diff --git a/palacios/src/palacios/vmm_mem.c b/palacios/src/palacios/vmm_mem.c
index ee99811..390de61 100644
--- a/palacios/src/palacios/vmm_mem.c
+++ b/palacios/src/palacios/vmm_mem.c
@@ -73,6 +73,11 @@ int v3_init_mem_map(struct v3_vm_info * vm) {
     map->base_region.host_addr = (addr_t)V3_AllocPages(mem_pages);
 #endif
 
+    if ((void*)map->base_region.host_addr == NULL) { 
+       PrintError("Could not allocate guest memory\n");
+       return -1;
+    }
+
     // Clear the memory...
     memset(V3_VAddr((void *)map->base_region.host_addr), 0, mem_pages * PAGE_SIZE_4KB);
 
@@ -85,13 +90,6 @@ int v3_init_mem_map(struct v3_vm_info * vm) {
     
     map->base_region.unhandled = unhandled_err;
 
-    if ((void *)map->base_region.host_addr == NULL) {
-	PrintError("Could not allocate Guest memory\n");
-	return -1;
-    }
-	
-    //memset(V3_VAddr((void *)map->base_region.host_addr), 0xffffffff, map->base_region.guest_end);
-
     v3_register_hypercall(vm, MEM_OFFSET_HCALL, mem_offset_hypercall, NULL);
 
     return 0;
@@ -126,6 +124,12 @@ struct v3_mem_region * v3_create_mem_region(struct v3_vm_info * vm, uint16_t cor
     }
 
     entry = (struct v3_mem_region *)V3_Malloc(sizeof(struct v3_mem_region));
+
+    if (!entry) {
+	PrintError("Cannot allocate in creating a memory region\n");
+	return NULL;
+    }
+
     memset(entry, 0, sizeof(struct v3_mem_region));
 
     entry->guest_start = guest_addr_start;