X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_direct_paging_32.h;h=abe55fe01bd2a7c5047eb6e1aeaefdcebeb5153b;hb=3ad91649ab3f5b74f08ac049683ea1a75e63535c;hp=ff421bcd37701cf5fa437cc28ba4c4e3da747a03;hpb=a568601e28c34c590815d1d2a16e85fbca352ebd;p=palacios.git diff --git a/palacios/src/palacios/vmm_direct_paging_32.h b/palacios/src/palacios/vmm_direct_paging_32.h index ff421bc..abe55fe 100644 --- a/palacios/src/palacios/vmm_direct_paging_32.h +++ b/palacios/src/palacios/vmm_direct_paging_32.h @@ -30,8 +30,8 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info, - addr_t fault_addr, - pf_error_t error_code) { + addr_t fault_addr, + pf_error_t error_code) { // Check to see if pde and pte exist (create them if not) pde32_t * pde = CR3_TO_PDE32_VA(info->ctrl_regs.cr3); pte32_t * pte = NULL; @@ -44,7 +44,7 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info, if ((region == NULL) || (region->host_type == SHDW_REGION_INVALID)) { - PrintError("Invalid region in passthrough page fault 32PAE, addr=%p\n", + PrintError("Invalid region in passthrough page fault 32, addr=%p\n", (void *)fault_addr); return -1; } @@ -88,15 +88,14 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info, PrintError("Unknown Region Type...\n"); return -1; } - } else { - if ( (region->host_type == SHDW_REGION_WRITE_HOOK) && - (error_code.write == 1) ) { - return v3_handle_mem_wr_hook(info, fault_addr, fault_addr, region, error_code); - } else { - PrintError("Weird...\n"); - return -1; - } } + + if ( (region->host_type == SHDW_REGION_WRITE_HOOK) && + (error_code.write == 1) ) { + + return v3_handle_mem_wr_hook(info, fault_addr, fault_addr, region, error_code); + } + return 0; }