X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_shadow_paging.c;h=4a4e7190e8688de2732eed5136c0a2e07f8c2e35;hb=82b8b87c344fcd1eab22e3f3be5ad54cbb3f8f68;hp=a3c802f3da5c83b2ff89bd8fc6acbea47f93f343;hpb=b06d0d0e5e57f5c4163a69efcabe6f96594ad814;p=palacios.git

diff --git a/palacios/src/palacios/vmm_shadow_paging.c b/palacios/src/palacios/vmm_shadow_paging.c
index a3c802f..4a4e719 100644
--- a/palacios/src/palacios/vmm_shadow_paging.c
+++ b/palacios/src/palacios/vmm_shadow_paging.c
@@ -30,7 +30,7 @@
 
 #include <palacios/vmm_direct_paging.h>
 
-#ifndef DEBUG_SHADOW_PAGING
+#ifndef CONFIG_DEBUG_SHADOW_PAGING
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -51,7 +51,7 @@ struct shadow_page_data {
 
 
 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);
+static int inject_guest_pf(struct guest_info * info, addr_t fault_addr, pf_error_t error_code);
 static int is_guest_pf(pt_access_status_t guest_access, pt_access_status_t shadow_access);
 
 
@@ -66,6 +66,7 @@ int v3_init_shadow_page_state(struct guest_info * info) {
   
     state->guest_cr3 = 0;
     state->guest_cr0 = 0;
+    state->guest_efer.value = 0x0LL;
 
     INIT_LIST_HEAD(&(state->page_list));
   
@@ -78,7 +79,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 +90,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 +108,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 +125,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 +141,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 +175,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 +185,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;
     }
 }
@@ -235,13 +236,17 @@ 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) {
+static int inject_guest_pf(struct guest_info * info, addr_t fault_addr, pf_error_t error_code) {
+
+#ifdef CONFIG_PROFILE_VMM
     if (info->enable_profiler) {
 	info->profiler.guest_pf_cnt++;
     }
+#endif
 
     info->ctrl_regs.cr2 = fault_addr;
-    v3_raise_exception_with_error(info, PF_EXCEPTION, *(uint_t *)&error_code);
+
+    return v3_raise_exception_with_error(info, PF_EXCEPTION, *(uint_t *)&error_code);
 }