X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest_mem.c;h=2aa7c585ca87e55da179634c8f884ddbf11797c9;hb=abe79f30c8babe9d9e3989cf4a61ae4f3b5ce7e9;hp=b17dd76b378a8ebaae0f690162cc4623708256ab;hpb=266af4b5b19da7bee8e7445288c7c1cb3ee194c7;p=palacios.git

diff --git a/palacios/src/palacios/vm_guest_mem.c b/palacios/src/palacios/vm_guest_mem.c
index b17dd76..2aa7c58 100644
--- a/palacios/src/palacios/vm_guest_mem.c
+++ b/palacios/src/palacios/vm_guest_mem.c
@@ -63,20 +63,22 @@ int host_pa_to_host_va(addr_t host_pa, addr_t * host_va) {
     return 0;
 }
 
+int guest_pa_to_host_pa(struct guest_info * info, addr_t guest_pa, addr_t * host_pa) {
+    struct v3_shadow_region * shdw_reg = v3_get_shadow_region(info->vm_info, info->cpu_id, guest_pa);
 
-
-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);
-
-    *host_pa = v3_get_shadow_addr(shdw_reg, 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_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, info->cpu_id, guest_pa);
 
     return 0;
 }