X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest_mem.c;h=876f0b3675eadf831e58caf015415e70abe585ef;hp=f4cd053d780759bb500ce590a4810a9f2df17578;hb=7f5fe648423f83c0883d6daa3f15751f9e74daf0;hpb=11b5cccde17af54f3998c38952e0eeedf85ced0a

diff --git a/palacios/src/palacios/vm_guest_mem.c b/palacios/src/palacios/vm_guest_mem.c
index f4cd053..876f0b3 100644
--- a/palacios/src/palacios/vm_guest_mem.c
+++ b/palacios/src/palacios/vm_guest_mem.c
@@ -151,7 +151,7 @@ int guest_va_to_guest_pa(struct guest_info * guest_info, addr_t guest_va, addr_t
     return 0;
   }
 
-  if (guest_info->mem_mode == SHADOW_PAGING) {
+  if (guest_info->shdw_pg_mode == SHADOW_PAGING) {
     guest_cr3 = guest_info->shdw_pg_state.guest_cr3;
   } else {
     guest_cr3 = guest_info->ctrl_regs.cr3;
@@ -161,13 +161,28 @@ int guest_va_to_guest_pa(struct guest_info * guest_info, addr_t guest_va, addr_t
   // Guest Is in Paged mode
   switch (guest_info->cpu_mode) {
   case PROTECTED:
-    return v3_translate_guest_pt_32(guest_info, guest_cr3, guest_va, guest_pa);
+    if (v3_translate_guest_pt_32(guest_info, guest_cr3, guest_va, guest_pa) == -1) {
+      PrintDebug("Could not translate addr (%p) through 32 bit guest PT at %p\n", 
+		 (void *)guest_va, (void *)(addr_t)guest_cr3);
+      return -1;
+    }
+    break;
   case PROTECTED_PAE:
-    return v3_translate_guest_pt_32pae(guest_info, guest_cr3, guest_va, guest_pa);
+    if (v3_translate_guest_pt_32pae(guest_info, guest_cr3, guest_va, guest_pa) == -1) {
+      PrintDebug("Could not translate addr (%p) through 32 bitpae guest PT at %p\n", 
+		 (void *)guest_va, (void *)(addr_t)guest_cr3);
+      return -1;
+    }
+    break;
   case LONG:
   case LONG_32_COMPAT:
   case LONG_16_COMPAT:
-    return v3_translate_guest_pt_64(guest_info, guest_cr3, guest_va, guest_pa);
+    if (v3_translate_guest_pt_64(guest_info, guest_cr3, guest_va, guest_pa) == -1) {
+      PrintDebug("Could not translate addr (%p) through 64 bit guest PT at %p\n", 
+		 (void *)guest_va, (void *)(addr_t)guest_cr3);
+      return -1;
+    }
+    break;
   default:
     return -1;
   }