From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Fri, 27 Mar 2009 00:12:44 +0000 (-0500)
Subject: really fixed the gpa->hpa error check
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=52bcd30a848d41e4ad84b237f3f6bec2600da3a9

really fixed the gpa->hpa error check
---

diff --git a/palacios/src/palacios/vm_guest_mem.c b/palacios/src/palacios/vm_guest_mem.c
index 8455dd6..c88ecd2 100644
--- a/palacios/src/palacios/vm_guest_mem.c
+++ b/palacios/src/palacios/vm_guest_mem.c
@@ -68,14 +68,19 @@ int host_pa_to_host_va(addr_t host_pa, addr_t * host_va) {
 int guest_pa_to_host_pa(struct guest_info * guest_info, addr_t guest_pa, addr_t * host_pa) {
     struct v3_shadow_region * shdw_reg = v3_get_shadow_region(guest_info, guest_pa);
 
-    if ((shdw_reg == NULL) ||
-	(shdw_reg->host_type == SHDW_REGION_INVALID) ||
-	(shdw_reg->host_type == SHDW_REGION_FULL_HOOK)){
+    if (shdw_reg == NULL) {
+	PrintError("In GPA->HPA: Could not find address in shadow map (addr=%p) (NULL REGION)\n", 
+		   (void *)guest_pa);
+	return -1;
+    }
+    
+    if ((shdw_reg->host_type == SHDW_REGION_INVALID) ||
+	(shdw_reg->host_type == SHDW_REGION_FULL_HOOK)) {
 	PrintError("In GPA->HPA: Could not find address in shadow map (addr=%p) (reg_type=%s)\n", 
 		   (void *)guest_pa, v3_shdw_region_type_to_str(shdw_reg->host_type));
 	return -1;
     }
-
+    
     *host_pa = v3_get_shadow_addr(shdw_reg, guest_pa);
 
     return 0;