X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fmmu%2Fvmm_shdw_pg_tlb_32.h;h=c9f66f83a4ad1d5da2111feaae829facc1a12b40;hb=d0ebfed83ac079f95da8bf79e64ac77f31d551ac;hp=91ae34e793ddb90b60a32b7affbf9acc53fd76e6;hpb=e59d15ae2aab909879f817c3f45400d92af98a43;p=palacios.releases.git

diff --git a/palacios/src/palacios/mmu/vmm_shdw_pg_tlb_32.h b/palacios/src/palacios/mmu/vmm_shdw_pg_tlb_32.h
index 91ae34e..c9f66f8 100644
--- a/palacios/src/palacios/mmu/vmm_shdw_pg_tlb_32.h
+++ b/palacios/src/palacios/mmu/vmm_shdw_pg_tlb_32.h
@@ -200,7 +200,7 @@ static int handle_pte_shadow_pagefault_32(struct guest_info * info, addr_t fault
     pte32_t * shadow_pte = (pte32_t *)&(shadow_pt[PTE32_INDEX(fault_addr)]);
     addr_t guest_pa = BASE_TO_PAGE_ADDR((addr_t)(guest_pte->page_base_addr)) +  PAGE_OFFSET(fault_addr);
 
-    struct v3_shadow_region * shdw_reg =  v3_get_shadow_region(info->vm_info, info->cpu_id, guest_pa);
+    struct v3_mem_region * shdw_reg =  v3_get_mem_region(info->vm_info, info->cpu_id, guest_pa);
 
     if (shdw_reg == NULL) {
 	// Inject a machine check in the guest
@@ -274,16 +274,14 @@ static int handle_pte_shadow_pagefault_32(struct guest_info * info, addr_t fault
 	    }
 
 
-
-	    // Write hooks trump all, and are set Read Only
 	    if (shdw_reg->flags.write == 0) {
 		shadow_pte->writable = 0;
 	    }
 
-	} else if (shdw_reg->flags.hook == 1) {
-	    // Page fault handled by hook functions
-
-	    if (v3_handle_mem_hook(info, fault_addr, guest_pa, shdw_reg, error_code) == -1) {
+	} else {
+	    // Page fault on unhandled memory region
+	    
+	    if (shdw_reg->unhandled(info, fault_addr, guest_pa, shdw_reg, error_code) == -1) {
 		PrintError("Special Page fault handler returned error for address: %p\n",  (void *)fault_addr);
 		return -1;
 	    }
@@ -291,14 +289,14 @@ static int handle_pte_shadow_pagefault_32(struct guest_info * info, addr_t fault
     } else if (shadow_pte_access == PT_ACCESS_WRITE_ERROR) {
 	guest_pte->dirty = 1;
 
-	if (shdw_reg->flags.hook == 1) {
-	    if (v3_handle_mem_hook(info, fault_addr, guest_pa, shdw_reg, error_code) == -1) {
+	if (shdw_reg->flags.write == 1) {
+	    PrintDebug("Shadow PTE Write Error\n");
+	    shadow_pte->writable = guest_pte->writable;
+	} else {
+	    if (shdw_reg->unhandled(info, fault_addr, guest_pa, shdw_reg, error_code) == -1) {
 		PrintError("Special Page fault handler returned error for address: %p\n",  (void *)fault_addr);
 		return -1;
 	    }
-	} else {
-	    PrintDebug("Shadow PTE Write Error\n");
-	    shadow_pte->writable = guest_pte->writable;
 	}
 
 
@@ -333,7 +331,7 @@ static int handle_4MB_shadow_pagefault_32(struct guest_info * info,
     PrintDebug("Handling 4MB fault (guest_fault_pa=%p) (error_code=%x)\n", (void *)guest_fault_pa, *(uint_t*)&error_code);
     PrintDebug("ShadowPT=%p, LargeGuestPDE=%p\n", shadow_pt, large_guest_pde);
 
-    struct v3_shadow_region * shdw_reg = v3_get_shadow_region(info->vm_info, info->cpu_id, guest_fault_pa);
+    struct v3_mem_region * shdw_reg = v3_get_mem_region(info->vm_info, info->cpu_id, guest_fault_pa);
 
  
     if (shdw_reg == NULL) {
@@ -384,16 +382,16 @@ static int handle_4MB_shadow_pagefault_32(struct guest_info * info,
 		shadow_pte->writable = 1;
 	    }
 
-	} else if (shdw_reg->flags.hook == 1) {
-	    if (v3_handle_mem_hook(info, fault_addr, guest_fault_pa, shdw_reg, error_code) == -1) {
+	} else {
+	    if (shdw_reg->unhandled(info, fault_addr, guest_fault_pa, shdw_reg, error_code) == -1) {
 		PrintError("Special Page Fault handler returned error for address: %p\n", (void *)fault_addr);
 		return -1;
 	    }
 	}
     } else if (shadow_pte_access == PT_ACCESS_WRITE_ERROR) {
 
-	if (shdw_reg->flags.hook == 1) {
-	    if (v3_handle_mem_hook(info, fault_addr, guest_fault_pa, shdw_reg, error_code) == -1) {
+	if (shdw_reg->flags.write == 0) {
+	    if (shdw_reg->unhandled(info, fault_addr, guest_fault_pa, shdw_reg, error_code) == -1) {
 		PrintError("Special Page Fault handler returned error for address: %p\n", (void *)fault_addr);
 		return -1;
 	    }