renamed guest cpu/mem mode functions

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

diff --git a/palacios/src/palacios/vmm_shadow_paging.c b/palacios/src/palacios/vmm_shadow_paging.c
index 8074c16..b2d3b6c 100644 (file)
--- a/palacios/src/palacios/vmm_shadow_paging.c
+++ b/palacios/src/palacios/vmm_shadow_paging.c
@@ -49,19 +49,6 @@ struct shadow_page_data {
 };
 
 
-DEFINE_HASHTABLE_INSERT(add_pte_map, addr_t, addr_t);
-DEFINE_HASHTABLE_SEARCH(find_pte_map, addr_t, addr_t);
-//DEFINE_HASHTABLE_REMOVE(del_pte_map, addr_t, addr_t, 0);
-
-
-
-static uint_t pte_hash_fn(addr_t key) {
-    return hash_long(key, 32);
-}
-
-static int pte_equals(addr_t key1, addr_t key2) {
-    return (key1 == key2);
-}
 
 static struct shadow_page_data * create_new_shadow_pt(struct guest_info * info);
 static void inject_guest_pf(struct guest_info * info, addr_t fault_addr, pf_error_t error_code);
@@ -81,9 +68,6 @@ int v3_init_shadow_page_state(struct guest_info * info) {
     state->guest_cr0 = 0;
 
     INIT_LIST_HEAD(&(state->page_list));
-
-    state->cached_ptes = NULL;
-    state->cached_cr3 = 0;
   
     return 0;
 }
@@ -94,7 +78,7 @@ int v3_init_shadow_page_state(struct guest_info * info) {
 // creates new shadow page tables
 // updates the shadow CR3 register to point to the new pts
 int v3_activate_shadow_pt(struct guest_info * info) {
-    switch (v3_get_cpu_mode(info)) {
+    switch (v3_get_vm_cpu_mode(info)) {
 
        case PROTECTED:
            return activate_shadow_pt_32(info);
@@ -105,7 +89,7 @@ int v3_activate_shadow_pt(struct guest_info * info) {
        case LONG_16_COMPAT:
            return activate_shadow_pt_64(info);
        default:
-           PrintError("Invalid CPU mode: %s\n", v3_cpu_mode_to_str(v3_get_cpu_mode(info)));
+           PrintError("Invalid CPU mode: %s\n", v3_cpu_mode_to_str(v3_get_vm_cpu_mode(info)));
            return -1;
     }
 
@@ -113,26 +97,22 @@ int v3_activate_shadow_pt(struct guest_info * info) {
 }
 
 
-int v3_activate_passthrough_pt(struct guest_info * info) {
-    // For now... But we need to change this....
-    // As soon as shadow paging becomes active the passthrough tables are hosed
-    // So this will cause chaos if it is called at that time
 
-    info->ctrl_regs.cr3 = *(addr_t*)&(info->direct_map_pt);
-    //PrintError("Activate Passthrough Page tables not implemented\n");
-    return 0;
+// This must flush any caches
+// and reset the cr3 value to the correct value
+int v3_invalidate_shadow_pts(struct guest_info * info) {
+    return v3_activate_shadow_pt(info);
 }
 
 
-
 int v3_handle_shadow_pagefault(struct guest_info * info, addr_t fault_addr, pf_error_t error_code) {
   
-    if (v3_get_mem_mode(info) == PHYSICAL_MEM) {
+    if (v3_get_vm_mem_mode(info) == PHYSICAL_MEM) {
        // If paging is not turned on we need to handle the special cases
        return v3_handle_passthrough_pagefault(info, fault_addr, error_code);
-    } else if (v3_get_mem_mode(info) == VIRTUAL_MEM) {
+    } else if (v3_get_vm_mem_mode(info) == VIRTUAL_MEM) {
 
-       switch (v3_get_cpu_mode(info)) {
+       switch (v3_get_vm_cpu_mode(info)) {
            case PROTECTED:
                return handle_shadow_pagefault_32(info, fault_addr, error_code);
                break;
@@ -144,7 +124,7 @@ int v3_handle_shadow_pagefault(struct guest_info * info, addr_t fault_addr, pf_e
                return handle_shadow_pagefault_64(info, fault_addr, error_code);
                break;
            default:
-               PrintError("Unhandled CPU Mode: %s\n", v3_cpu_mode_to_str(v3_get_cpu_mode(info)));
+               PrintError("Unhandled CPU Mode: %s\n", v3_cpu_mode_to_str(v3_get_vm_cpu_mode(info)));
                return -1;
        }
     } else {
@@ -160,14 +140,14 @@ int v3_handle_shadow_invlpg(struct guest_info * info) {
     int ret = 0;
     addr_t vaddr = 0;
 
-    if (v3_get_mem_mode(info) != VIRTUAL_MEM) {
+    if (v3_get_vm_mem_mode(info) != VIRTUAL_MEM) {
        // Paging must be turned on...
        // should handle with some sort of fault I think
        PrintError("ERROR: INVLPG called in non paged mode\n");
        return -1;
     }
 
-    if (v3_get_mem_mode(info) == PHYSICAL_MEM) { 
+    if (v3_get_vm_mem_mode(info) == PHYSICAL_MEM) { 
        ret = read_guest_pa_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
     } else { 
        ret = read_guest_va_memory(info, get_addr_linear(info, info->rip, &(info->segments.cs)), 15, instr);
@@ -194,7 +174,7 @@ int v3_handle_shadow_invlpg(struct guest_info * info) {
 
     info->rip += dec_instr.instr_length;
 
-    switch (v3_get_cpu_mode(info)) {
+    switch (v3_get_vm_cpu_mode(info)) {
        case PROTECTED:
            return handle_shadow_invlpg_32(info, vaddr);
        case PROTECTED_PAE:
@@ -204,7 +184,7 @@ int v3_handle_shadow_invlpg(struct guest_info * info) {
        case LONG_16_COMPAT:
            return handle_shadow_invlpg_64(info, vaddr);
        default:
-           PrintError("Invalid CPU mode: %s\n", v3_cpu_mode_to_str(v3_get_cpu_mode(info)));
+           PrintError("Invalid CPU mode: %s\n", v3_cpu_mode_to_str(v3_get_vm_cpu_mode(info)));
            return -1;
     }
 }