X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_shadow_paging_32.h;h=4614232fcf17fd0bc452b7639b8ee09fea510a98;hp=4c8922b9cf588e4d3f5e7d9e41d61a94354d8c3a;hb=7c9087090f06a3fdf041f650912c36b6b12d7a82;hpb=2b21111e5aec30a54f47383a11b179b0bd226463

diff --git a/palacios/src/palacios/vmm_shadow_paging_32.h b/palacios/src/palacios/vmm_shadow_paging_32.h
index 4c8922b..4614232 100644
--- a/palacios/src/palacios/vmm_shadow_paging_32.h
+++ b/palacios/src/palacios/vmm_shadow_paging_32.h
@@ -36,11 +36,6 @@ static inline int activate_shadow_pt_32(struct guest_info * info) {
     return 0;
 }
 
-#ifdef CONFIG_SYMBIOTIC_SWAP
-static inline int is_swapped_pte32(pte32_t * pte) {
-    return (*(uint32_t *)pte != 0);
-}
-#endif
 
 
 
@@ -229,16 +224,14 @@ static int handle_pte_shadow_pagefault_32(struct guest_info * info, addr_t fault
 
 	PrintDebug("Access error injecting pf to guest (guest access error=%d) (pf error code=%d)\n", 
 		   guest_pte_access, *(uint_t*)&error_code);
-#ifdef CONFIG_SYMBIOTIC_SWAP_
-	if (is_swapped_pg(guest_pte)) {
-	    PrintError("Page fault on swapped out page\n");
+#ifdef CONFIG_SYMBIOTIC_SWAP
+	if (is_swapped_pte32(guest_pte)) {
+	    PrintError("Page fault on swapped out page (pte=%x)\n", *(uint32_t *)guest_pte);
 
 	    if (inject_guest_pf(info, fault_addr, error_code) == -1) {
 		PrintError("Could not inject guest page fault\n");
 		return -1;
 	    }
-
-
 	} else {
 	    if (inject_guest_pf(info, fault_addr, error_code) == -1) {
 		PrintError("Could not inject guest page fault\n");