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=03e1f7ac0e2a6061694803e5e8e3408a87cd0305;hp=2760400bb37845c830beacb0d82d5e5f47601764;hb=316c417125ed34aaa60f9fc5486a6d8dec4fb361;hpb=6fe9fe338ec19b212b43bb2c25322dce3cdbb490

diff --git a/palacios/src/palacios/vmm_shadow_paging_32.h b/palacios/src/palacios/vmm_shadow_paging_32.h
index 2760400..03e1f7a 100644
--- a/palacios/src/palacios/vmm_shadow_paging_32.h
+++ b/palacios/src/palacios/vmm_shadow_paging_32.h
@@ -229,7 +229,7 @@ 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_pte32(guest_pte)) {
+	if ((error_code.write == 0) && (is_swapped_pte32(guest_pte))) {
 	    PrintError("Page fault on swapped out page (pte=%x)\n", *(uint32_t *)guest_pte);
 
  	    addr_t swp_pg_addr = v3_get_swapped_pg_addr(info, shadow_pte, guest_pte);
@@ -245,13 +245,20 @@ static int handle_pte_shadow_pagefault_32(struct guest_info * info, addr_t fault
 		 */
 		
 		/* We need some way to check permissions.... */
-
+		
 		shadow_pte->accessed = 1;
-		shadow_pte->writable = 1;
+		shadow_pte->writable = 0;
+
+		if (fault_addr & 0xc0000000) {
+		    shadow_pte->user_page = 0;
+		} else {
+		    shadow_pte->user_page = 1;
+		}
+
 		shadow_pte->write_through = 0;
 		shadow_pte->cache_disable = 0;
 		shadow_pte->global_page = 0;
-		shadow_pte->user_page = 1;
+	
 		shadow_pte->present = 1;
 		
 		shadow_pte->page_base_addr = swp_pg_addr;