X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_direct_paging_32.h;h=42da5b14ac7df88ede0e7ac6a0bf92ef2d2cdb90;hb=058a3adde5893927ae056a1d8fbccd5191d2446f;hp=4df18a96f26e982a81027fb7be0ce13614b205ae;hpb=266af4b5b19da7bee8e7445288c7c1cb3ee194c7;p=palacios.git

diff --git a/palacios/src/palacios/vmm_direct_paging_32.h b/palacios/src/palacios/vmm_direct_paging_32.h
index 4df18a9..42da5b1 100644
--- a/palacios/src/palacios/vmm_direct_paging_32.h
+++ b/palacios/src/palacios/vmm_direct_paging_32.h
@@ -33,7 +33,7 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
 						  addr_t fault_addr, 
 						  pf_error_t error_code) {
     // Check to see if pde and pte exist (create them if not)
-    pde32_t * pde = CR3_TO_PDE32_VA(info->ctrl_regs.cr3);
+    pde32_t * pde = NULL;
     pte32_t * pte = NULL;
     addr_t host_addr = 0;
     
@@ -42,8 +42,7 @@ static inline int handle_passthrough_pagefault_32(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 32, addr=%p\n", 
 		   (void *)fault_addr);
 	return -1;
@@ -51,6 +50,14 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
     
     host_addr = v3_get_shadow_addr(region, fault_addr);
     
+    // Lookup the correct PDE address based on the PAGING MODE
+    if (info->shdw_pg_mode == SHADOW_PAGING) {
+	pde = CR3_TO_PDE32_VA(info->ctrl_regs.cr3);
+    } else {
+	pde = CR3_TO_PDE32_VA(info->direct_map_pt);
+    }
+
+
     // Fix up the PDE entry
     if (pde[pde_index].present == 0) {
 	pte = (pte32_t *)create_generic_pt_page();