added guest page table translators for 32/32PAE/64 page tables

[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 920c8bb..c320727 100644 (file)
--- a/palacios/src/palacios/vm_guest_mem.c
+++ b/palacios/src/palacios/vm_guest_mem.c
@@ -160,9 +160,9 @@ int guest_va_to_guest_pa(struct guest_info * guest_info, addr_t guest_va, addr_t
       addr_t guest_pde = 0;
       
       if (guest_info->shdw_pg_mode == SHADOW_PAGING) {
-       guest_pde = (addr_t)V3_PAddr((void *)(addr_t)CR3_TO_PDE32((void *)(addr_t)(guest_info->shdw_pg_state.guest_cr3)));
+       guest_pde = CR3_TO_PDE32_PA((guest_info->shdw_pg_state.guest_cr3));
       } else if (guest_info->shdw_pg_mode == NESTED_PAGING) {
-       guest_pde = (addr_t)V3_PAddr((void *)(addr_t)CR3_TO_PDE32((void *)(addr_t)(guest_info->ctrl_regs.cr3)));
+       guest_pde = CR3_TO_PDE32_PA((guest_info->ctrl_regs.cr3));
       }
       
       if (guest_pa_to_host_va(guest_info, guest_pde, (addr_t *)&pde) == -1) {
@@ -173,13 +173,13 @@ int guest_va_to_guest_pa(struct guest_info * guest_info, addr_t guest_va, addr_t
       
       
       switch (pde32_lookup(pde, guest_va, &tmp_pa)) {
-      case PDE32_ENTRY_NOT_PRESENT: 
+      case PT_ENTRY_NOT_PRESENT: 
        *guest_pa = 0;
        return -1;
-      case PDE32_ENTRY_LARGE_PAGE:
+      case PT_ENTRY_LARGE_PAGE:
        *guest_pa = tmp_pa;
        return 0;
-      case PDE32_ENTRY_PTE32:
+      case PT_ENTRY_PAGE:
        {
          pte32_t * pte = 0;
          
@@ -192,7 +192,7 @@ int guest_va_to_guest_pa(struct guest_info * guest_info, addr_t guest_va, addr_t
          
          //PrintDebug("PTE host addr=%x, GVA=%x, GPA=%x(should be 0)\n", pte, guest_va, *guest_pa);
         
-         if (pte32_lookup(pte, guest_va, guest_pa) != 0) {
+         if (pte32_lookup(pte, guest_va, guest_pa) != PT_ENTRY_PAGE) {
            PrintError("In GVA->GPA: PTE32 Lookup failure GVA=%p; PTE=%p\n", 
                        (void *)guest_va,  (void *)pte);
            //        PrintPT32(PDE32_INDEX(guest_va) << 22, pte);