X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=490e3428560ad8333e49f7be4f8bb936d98a3eb1;hb=52e81251f82ccaf516e3ed626c8abbcc9fbe3f41;hp=8c2e2d7c1567d2615c02b7b18171b8e2b881fbef;hpb=11ae9bb2d18273267d41059a4bd7fb3c28c42abc;p=palacios.git

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index 8c2e2d7..490e342 100644
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -36,8 +36,6 @@
 
 #include <palacios/vmm_rbtree.h>
 
-#include <palacios/vmm_profiler.h>
-
 #include <palacios/vmm_direct_paging.h>
 
 #include <palacios/vmm_ctrl_regs.h>
@@ -126,7 +124,8 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info *vm_info) {
 
     vm_info->vm_regs.rdx = 0x00000f00;
 
-    guest_state->cr0 = 0x60000010;
+
+    guest_state->cr0 = 0x60010010; // Set the WP flag so the memory hooks work in real-mode
 
 
     guest_state->cs.selector = 0xf000;
@@ -320,12 +319,6 @@ static int start_svm_guest(struct guest_info *info) {
 	
 	if ((num_exits % 5000) == 0) {
 	    PrintDebug("SVM Exit number %d\n", num_exits);
-
-#ifdef CONFIG_PROFILE_VMM
-	    if (info->enable_profiler) {
-		v3_print_profile(info);
-	    }
-#endif
 	}
 
 	if (v3_handle_svm_exit(info) != 0) {
@@ -358,7 +351,7 @@ static int start_svm_guest(struct guest_info *info) {
 	    PrintDebug("Host Address of rip = 0x%p\n", (void *)host_addr);
 
 	    PrintDebug("Instr (15 bytes) at %p:\n", (void *)host_addr);
-	    PrintTraceMemDump((uchar_t *)host_addr, 15);
+	    v3_dump_mem((uint8_t *)host_addr, 15);
 
 	    break;
 	}
@@ -571,7 +564,7 @@ void v3_init_SVM(struct v3_ctrl_ops * vmm_ops) {
 			  "movq  %%rcx, %%rax ; "
 			  vmload
 			  "rdtsc ; "
-			  : "=D"(start_hi), "=S"(start_lo), "=a"(end_lo),d"(end_hi)
+			  : "=D"(start_hi), "=S"(start_lo), "=a"(end_lo),"=d"(end_hi)
 			      : "c"(host_vmcb), "0"(0), "1"(0), "2"(0), "3"(0)
 			      );