X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest_mem.c;h=b8db954cfa2d8ccb8b845c9681cdec74412d1c5c;hb=75aa9d6205930057dc8163238d325558bcb1fd9b;hp=876f0b3675eadf831e58caf015415e70abe585ef;hpb=7f5fe648423f83c0883d6daa3f15751f9e74daf0;p=palacios-OLD.git diff --git a/palacios/src/palacios/vm_guest_mem.c b/palacios/src/palacios/vm_guest_mem.c index 876f0b3..b8db954 100644 --- a/palacios/src/palacios/vm_guest_mem.c +++ b/palacios/src/palacios/vm_guest_mem.c @@ -66,12 +66,15 @@ int host_pa_to_host_va(addr_t host_pa, addr_t * host_va) { int guest_pa_to_host_pa(struct guest_info * guest_info, addr_t guest_pa, addr_t * host_pa) { - // we use the shadow map here... - host_region_type_t reg_type = lookup_shadow_map_addr(&(guest_info->mem_map), guest_pa, host_pa); + struct v3_shadow_region * shdw_reg = v3_get_shadow_region(guest_info, guest_pa); - if (reg_type != HOST_REGION_PHYSICAL_MEMORY) { - PrintError("In GPA->HPA: Could not find address in shadow map (addr=%p) (reg_type=%d)\n", - (void *)guest_pa, reg_type); + *host_pa = v3_get_shadow_addr(shdw_reg, guest_pa); + + if ((shdw_reg == NULL) || + (shdw_reg->host_type == SHDW_REGION_INVALID) || + (shdw_reg->host_type == SHDW_REGION_FULL_HOOK)){ + PrintError("In GPA->HPA: Could not find address in shadow map (addr=%p) (reg_type=%s)\n", + (void *)guest_pa, v3_shdw_region_type_to_str(shdw_reg->host_type)); return -1; }