X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_direct_paging_32pae.h;h=d681969eff96f00666f52520236bdd9009b954bc;hb=058a3adde5893927ae056a1d8fbccd5191d2446f;hp=033c69d6dd51ecd7347f71bca57e9c62e6fee57b;hpb=266af4b5b19da7bee8e7445288c7c1cb3ee194c7;p=palacios.git

diff --git a/palacios/src/palacios/vmm_direct_paging_32pae.h b/palacios/src/palacios/vmm_direct_paging_32pae.h
index 033c69d..d681969 100644
--- a/palacios/src/palacios/vmm_direct_paging_32pae.h
+++ b/palacios/src/palacios/vmm_direct_paging_32pae.h
@@ -31,7 +31,7 @@
 static inline int handle_passthrough_pagefault_32pae(struct guest_info * info, 
 						     addr_t fault_addr, 
 						     pf_error_t error_code) {
-    pdpe32pae_t * pdpe = CR3_TO_PDPE32PAE_VA(info->ctrl_regs.cr3);
+    pdpe32pae_t * pdpe = NULL;
     pde32pae_t * pde = NULL;
     pte32pae_t * pte = NULL;
     addr_t host_addr = 0;
@@ -42,8 +42,7 @@ static inline int handle_passthrough_pagefault_32pae(struct guest_info * info,
 
     struct v3_shadow_region * region =  v3_get_shadow_region(info, fault_addr);
   
-    if ((region == NULL) || 
-	(region->host_type == SHDW_REGION_INVALID)) {
+    if (region == NULL) {
 	PrintError("Invalid region in passthrough page fault 32PAE, addr=%p\n", 
 		   (void *)fault_addr);
 	return -1;
@@ -51,6 +50,13 @@ static inline int handle_passthrough_pagefault_32pae(struct guest_info * info,
 
     host_addr = v3_get_shadow_addr(region, fault_addr);
 
+    // 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);
+    } else {
+	pdpe = CR3_TO_PDPE32PAE_VA(info->direct_map_pt);
+    }
+
     // Fix up the PDPE entry
     if (pdpe[pdpe_index].present == 0) {
 	pde = (pde32pae_t *)create_generic_pt_page();