X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_direct_paging_32.h;h=bfbb4a3f40ea3963d12b3e7ed084162358a2c2cc;hb=2fa62a8319b951b761c235bde156e1eeacce996a;hp=2e7fb47a1cd7ed686a553cba995700e0c9746867;hpb=55ced750335769366957df3c0cc3fbc8b82a3ea9;p=palacios.git

diff --git a/palacios/src/palacios/vmm_direct_paging_32.h b/palacios/src/palacios/vmm_direct_paging_32.h
index 2e7fb47..bfbb4a3 100644
--- a/palacios/src/palacios/vmm_direct_paging_32.h
+++ b/palacios/src/palacios/vmm_direct_paging_32.h
@@ -39,15 +39,15 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
     int pde_index = PDE32_INDEX(fault_addr);
     int pte_index = PTE32_INDEX(fault_addr);
     
-    struct v3_shadow_region * region = v3_get_shadow_region(info, fault_addr);
-    
+    struct v3_shadow_region * region = v3_get_shadow_region(info->vm_info, info->cpu_id, fault_addr);
+
     if (region == NULL) {
 	PrintError("Invalid region in passthrough page fault 32, addr=%p\n", 
 		   (void *)fault_addr);
 	return -1;
     }
     
-    host_addr = v3_get_shadow_addr(region, fault_addr);
+    host_addr = v3_get_shadow_addr(region, info->cpu_id, fault_addr);
     
     // Lookup the correct PDE address based on the PAGING MODE
     if (info->shdw_pg_mode == SHADOW_PAGING) {
@@ -83,6 +83,7 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
 	    pte[pte_index].page_base_addr = PAGE_BASE_ADDR(host_addr);
 	} else if (region->host_type == SHDW_REGION_WRITE_HOOK) {
 	    // Only trap writes
+	    PrintDebug("Faulted in a write hook page\n");
 	    pte[pte_index].present = 1;
 	    pte[pte_index].writable = 0;
 	    
@@ -98,6 +99,7 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
     
     if ( (region->host_type == SHDW_REGION_WRITE_HOOK) && 
 	 (error_code.write == 1) ) {
+	PrintDebug("Triggering Direct paging Write hook\n");
 	return v3_handle_mem_wr_hook(info, fault_addr, fault_addr, region, error_code);
     }