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=b2d3b6cacd09cf5908cec479abee765e27e344fd;hpb=39849abeb743c4e6b669a790c307979fa8d51884;p=palacios.git

diff --git a/palacios/src/palacios/vmm_shadow_paging.c b/palacios/src/palacios/vmm_shadow_paging.c
index b2d3b6c..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));
   
@@ -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);
 }