X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_shadow_paging.c;h=b2d3b6cacd09cf5908cec479abee765e27e344fd;hp=a3c802f3da5c83b2ff89bd8fc6acbea47f93f343;hb=39849abeb743c4e6b669a790c307979fa8d51884;hpb=57de08049d9a345445d26741c5ee0f7f9e5c2fcc

diff --git a/palacios/src/palacios/vmm_shadow_paging.c b/palacios/src/palacios/vmm_shadow_paging.c
index a3c802f..b2d3b6c 100644
--- a/palacios/src/palacios/vmm_shadow_paging.c
+++ b/palacios/src/palacios/vmm_shadow_paging.c
@@ -78,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);
@@ -89,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;
     }
 
@@ -107,12 +107,12 @@ int v3_invalidate_shadow_pts(struct guest_info * 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;
@@ -124,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 {
@@ -140,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);
@@ -174,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:
@@ -184,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;
     }
 }