X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_direct_paging.c;h=e6b105262257919df0be56f1360901cdf2854f7c;hb=39849abeb743c4e6b669a790c307979fa8d51884;hp=1f2c6e678daac540c9f184954ab7632de1bd082f;hpb=b06d0d0e5e57f5c4163a69efcabe6f96594ad814;p=palacios-OLD.git

diff --git a/palacios/src/palacios/vmm_direct_paging.c b/palacios/src/palacios/vmm_direct_paging.c
index 1f2c6e6..e6b1052 100644
--- a/palacios/src/palacios/vmm_direct_paging.c
+++ b/palacios/src/palacios/vmm_direct_paging.c
@@ -50,7 +50,7 @@ int v3_init_passthrough_pts(struct guest_info * info) {
 }
 
 int v3_reset_passthrough_pts(struct guest_info * info) {
-    v3_vm_cpu_mode_t mode = v3_get_cpu_mode(info);
+    v3_cpu_mode_t mode = v3_get_vm_cpu_mode(info);
 
     // Delete the old direct map page tables
     switch(mode) {
@@ -88,7 +88,7 @@ int v3_activate_passthrough_pt(struct guest_info * info) {
 
 
 int v3_handle_passthrough_pagefault(struct guest_info * info, addr_t fault_addr, pf_error_t error_code) {
-    v3_vm_cpu_mode_t mode = v3_get_cpu_mode(info);
+    v3_cpu_mode_t mode = v3_get_vm_cpu_mode(info);
 
     switch(mode) {
 	case REAL:
@@ -112,7 +112,7 @@ int v3_handle_passthrough_pagefault(struct guest_info * info, addr_t fault_addr,
 
 int v3_handle_nested_pagefault(struct guest_info * info, addr_t fault_addr, pf_error_t error_code) {
     // THIS IS VERY BAD
-    v3_vm_cpu_mode_t mode = LONG;
+    v3_cpu_mode_t mode = LONG;
 
 
     PrintDebug("Nested PageFault: fault_addr=%p, error_code=%u\n",(void*)fault_addr, *(uint_t *)&error_code);
@@ -137,7 +137,7 @@ int v3_handle_nested_pagefault(struct guest_info * info, addr_t fault_addr, pf_e
 }
 
 int v3_invalidate_passthrough_addr(struct guest_info * info, addr_t inv_addr) {
-    v3_vm_cpu_mode_t mode = v3_get_cpu_mode(info);
+    v3_cpu_mode_t mode = v3_get_vm_cpu_mode(info);
 
     switch(mode) {
 	case REAL:
@@ -159,7 +159,7 @@ int v3_invalidate_passthrough_addr(struct guest_info * info, addr_t inv_addr) {
 
 
 int v3_invalidate_nested_addr(struct guest_info * info, addr_t inv_addr) {
-    v3_vm_cpu_mode_t mode = LONG;
+    v3_cpu_mode_t mode = LONG;
 
     switch(mode) {
 	case REAL: