X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_direct_paging_32pae.h;h=ca32a8473694a04e46864c3a2b215576351c5ab6;hb=194c3ac8da18934654586e121a0facfb36b4bc1f;hp=61ef6d983c497e0a8f5147cdc95683074a84f565;hpb=14fa18cc54571eaa7aaa0f7d55677bdb4dad81a6;p=palacios.git

diff --git a/palacios/src/palacios/vmm_direct_paging_32pae.h b/palacios/src/palacios/vmm_direct_paging_32pae.h
index 61ef6d9..ca32a84 100644
--- a/palacios/src/palacios/vmm_direct_paging_32pae.h
+++ b/palacios/src/palacios/vmm_direct_paging_32pae.h
@@ -40,19 +40,14 @@ static inline int handle_passthrough_pagefault_32pae(struct guest_info * info,
     int pde_index = PDE32PAE_INDEX(fault_addr);
     int pte_index = PTE32PAE_INDEX(fault_addr);
 
-    struct v3_mem_region * region =  v3_get_mem_region(info->vm_info, info->cpu_id, fault_addr);
+    struct v3_mem_region * region =  v3_get_mem_region(info->vm_info, info->vcpu_id, fault_addr);
   
     if (region == NULL) {
-	PrintError("Invalid region in passthrough page fault 32PAE, addr=%p\n", 
+	PrintError(info->vm_info, info, "Invalid region in passthrough page fault 32PAE, addr=%p\n", 
 		   (void *)fault_addr);
 	return -1;
     }
 
-    if (v3_gpa_to_hpa(info, fault_addr, &host_addr) == -1) {
-	PrintError("Could not translate fault address (%p)\n", (void *)fault_addr);
-	return -1;
-    }
-
     // Lookup the correct PDPE address based on the PAGING MODE
     if (info->shdw_pg_mode == SHADOW_PAGING) {
 	pdpe = CR3_TO_PDPE32PAE_VA(info->ctrl_regs.cr3);
@@ -101,6 +96,11 @@ static inline int handle_passthrough_pagefault_32pae(struct guest_info * info,
 		pte[pte_index].writable = 0;
 	    }
 
+	    if (v3_gpa_to_hpa(info, fault_addr, &host_addr) == -1) {
+		PrintError(info->vm_info, info, "Could not translate fault address (%p)\n", (void *)fault_addr);
+		return -1;
+	    }
+
 	    pte[pte_index].page_base_addr = PAGE_BASE_ADDR(host_addr);
 	} else {
 	    return region->unhandled(info, fault_addr, fault_addr, region, error_code);