X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_shadow_paging_32.h;h=e3367c2258f2bf3ccfe7affb7667dc7898fff945;hb=19c179d8c8a23c2612f9c12ec7cbedc299ce80e5;hp=b6ac4246dfa23bc7e3d4ac5752f3e2e9014784f8;hpb=449bf14185a1b3e2db53855b14e0e3ef3a803fd9;p=palacios.git

diff --git a/palacios/src/palacios/vmm_shadow_paging_32.h b/palacios/src/palacios/vmm_shadow_paging_32.h
index b6ac424..e3367c2 100644
--- a/palacios/src/palacios/vmm_shadow_paging_32.h
+++ b/palacios/src/palacios/vmm_shadow_paging_32.h
@@ -85,8 +85,8 @@ static inline int handle_shadow_pagefault_32(struct guest_info * info, addr_t fa
   
     /* Was the page fault caused by the Guest's page tables? */
     if (is_guest_pf(guest_pde_access, shadow_pde_access) == 1) {
-	PrintDebug("Injecting PDE pf to guest: (guest access error=%d) (pf error code=%d)\n", 
-		   *(uint_t *)&guest_pde_access, *(uint_t *)&error_code);
+	PrintDebug("Injecting PDE pf to guest: (guest access error=%d) (shdw access error=%d)  (pf error code=%d)\n", 
+		   *(uint_t *)&guest_pde_access, *(uint_t *)&shadow_pde_access, *(uint_t *)&error_code);
 	if (inject_guest_pf(info, fault_addr, error_code) == -1) {
 	    PrintError("Could not inject guest page fault\n");
 	    return -1;
@@ -240,7 +240,8 @@ static int handle_pte_shadow_pagefault_32(struct guest_info * info, addr_t fault
 	    }
 #endif
 	    if (error_code.write == 0) {
-		PrintError("Page fault on swapped out page (pte=%x) (error_code=%x)\n", *(uint32_t *)guest_pte, *(uint32_t *)&error_code);
+		V3_Print("Page fault on swapped out page (vaddr=%p) (pte=%x) (error_code=%x)\n", 
+			 (void *)fault_addr, *(uint32_t *)guest_pte, *(uint32_t *)&error_code);
 		
 		addr_t swp_pg_addr = v3_get_swapped_pg_addr(info, shadow_pte, guest_pte);
 		
@@ -259,7 +260,7 @@ static int handle_pte_shadow_pagefault_32(struct guest_info * info, addr_t fault
 		    shadow_pte->accessed = 1;
 		    shadow_pte->writable = 0;
 		    
-		    if (fault_addr & 0xc0000000) {
+		    if ((fault_addr & 0xc0000000) == 0xc0000000) {
 			shadow_pte->user_page = 0;
 		    } else {
 			shadow_pte->user_page = 1;