some fixes to caching, still segfaults at the init process

[palacios.releases.git] / palacios / src / palacios / svm.c

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index 4e362b5..7b33c8c 100644 (file)
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -44,6 +44,12 @@
 #include <palacios/vmm_sprintf.h>
 
 
+#ifndef CONFIG_DEBUG_SVM
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
+#endif
+
+
 uint32_t v3_last_exit;
 
 // This is a global pointer to the host's VMCB
@@ -478,13 +484,6 @@ int v3_svm_enter(struct guest_info * info) {
     //V3_Print("Calling v3_svm_launch\n");
 
 
-#if 0
-    if (info->cpu_id==1) { 
-       V3_Print("Entering Core 1\n");
-       v3_print_guest_state(info);
-    }
-#endif
-       
     v3_svm_launch((vmcb_t *)V3_PAddr(info->vmm_data), &(info->vm_regs), (vmcb_t *)host_vmcbs[info->cpu_id]);
     
     //V3_Print("SVM Returned: Exit Code: %x, guest_rip=%lx\n", (uint32_t)(guest_ctrl->exit_code), (unsigned long)guest_state->rip);
@@ -549,31 +548,12 @@ int v3_svm_enter(struct guest_info * info) {
 
 
 
-#if 0
-    if (info->cpu_id==1) { 
-       V3_Print("Exited Core 1, before handler\n");
-       v3_print_guest_state(info);
-       PrintDebugVMCB((vmcb_t*)(info->vmm_data));
-    }
-#endif
-
-
     if (v3_handle_svm_exit(info, exit_code, exit_info1, exit_info2) != 0) {
        PrintError("Error in SVM exit handler\n");
        return -1;
     }
 
 
-#if 0
-    if (info->cpu_id==1) { 
-       V3_Print("Exited Core 1, after handler\n");
-       v3_print_guest_state(info);
-       PrintDebugVMCB((vmcb_t*)(info->vmm_data));
-    }
-#endif
-
-
-
     return 0;
 }