X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_paging.h;h=3026e67ae11ae750607339d36c247832d06bfb1e;hb=276cfa264720edddc1677e35c6a300596965de7d;hp=d1f93f2a361cabc508458feb8e481a4b73bd4f19;hpb=c163873b7b96544683030cafba0e73a7ed988171;p=palacios.git diff --git a/palacios/include/palacios/vmm_paging.h b/palacios/include/palacios/vmm_paging.h index d1f93f2..3026e67 100644 --- a/palacios/include/palacios/vmm_paging.h +++ b/palacios/include/palacios/vmm_paging.h @@ -92,7 +92,6 @@ the host state in the vmcs before entering the guest. - #define MAX_PDE32_ENTRIES 1024 #define MAX_PTE32_ENTRIES 1024 @@ -186,13 +185,6 @@ typedef enum {PAGE_4KB, PAGE_2MB, PAGE_4MB, PAGE_1GB, - -/* Page Table Flag Values */ -#define PT32_HOOK 0x1 -#define V3_LARGE_PG 0x2 - - - /* We'll use the general form for now.... typedef enum {PDE32_ENTRY_NOT_PRESENT, PDE32_ENTRY_PTE32, PDE32_ENTRY_LARGE_PAGE} pde32_entry_type_t; typedef enum {PTE32_ENTRY_NOT_PRESENT, PTE32_ENTRY_PAGE} pte32_entry_type_t; @@ -212,6 +204,9 @@ typedef enum {PT_ENTRY_NOT_PRESENT, PT_ENTRY_LARGE_PAGE, PT_ENTRY_PAGE} pt_entry typedef enum {PT_ACCESS_OK, PT_ACCESS_NOT_PRESENT, PT_ACCESS_WRITE_ERROR, PT_ACCESS_USER_ERROR} pt_access_status_t; +/* Page table flag values */ +#define V3_LARGE_PG 0x2 + typedef struct gen_pt { uint_t present : 1; @@ -586,7 +581,7 @@ const uchar_t * v3_page_type_to_str(page_type_t type); void PrintPTEntry(struct guest_info * info, page_type_t type, addr_t vaddr, void * entry); -void PrintHostPageTables(struct guest_info * info, addr_t cr3); +void PrintHostPageTables(struct guest_info * info, v3_cpu_mode_t cpu_mode, addr_t cr3); void PrintGuestPageTables(struct guest_info * info, addr_t cr3); void PrintHostPageTree(struct guest_info * info, addr_t virtual_addr, addr_t cr3); void PrintGuestPageTree(struct guest_info * info, addr_t virtual_addr, addr_t cr3);