moved direct paging implementation over to new memory region flags structure

[palacios.git] / palacios / src / palacios / vm_guest_mem.c

diff --git a/palacios/src/palacios/vm_guest_mem.c b/palacios/src/palacios/vm_guest_mem.c
index c88ecd2..a13256b 100644 (file)
--- a/palacios/src/palacios/vm_guest_mem.c
+++ b/palacios/src/palacios/vm_guest_mem.c
@@ -63,10 +63,8 @@ int host_pa_to_host_va(addr_t host_pa, addr_t * host_va) {
     return 0;
 }
 
-
-
-int guest_pa_to_host_pa(struct guest_info * guest_info, addr_t guest_pa, addr_t * host_pa) {
-    struct v3_shadow_region * shdw_reg = v3_get_shadow_region(guest_info, guest_pa);
+int guest_pa_to_host_pa(struct guest_info * info, addr_t guest_pa, addr_t * host_pa) {
+    struct v3_shadow_region * shdw_reg = v3_get_shadow_region(info->vm_info, info->cpu_id, guest_pa);
 
     if (shdw_reg == NULL) {
        PrintError("In GPA->HPA: Could not find address in shadow map (addr=%p) (NULL REGION)\n", 
@@ -74,14 +72,13 @@ int guest_pa_to_host_pa(struct guest_info * guest_info, addr_t guest_pa, addr_t
        return -1;
     }
     
-    if ((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));
+    if (shdw_reg->flags.alloced == 0) {
+       PrintError("In GPA->HPA: Tried to translate physical address of non allocated page (addr=%p)\n", 
+                  (void *)guest_pa);
        return -1;
     }
-    
-    *host_pa = v3_get_shadow_addr(shdw_reg, guest_pa);
+       
+    *host_pa = v3_get_shadow_addr(shdw_reg, info->cpu_id, guest_pa);
 
     return 0;
 }