X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmx.c;h=c4b951f11ac9d7696dca90a435519454621f325c;hb=40d79cccadcdeb5b4744bf965030b40b0d5cb1fb;hp=a525e8735f28c2d5cfe87f8a317c1c06dc0dc2c0;hpb=fcc9962fe5d3b877f8f25de8745d0d4d1eaf394e;p=palacios.git

diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c
index a525e87..c4b951f 100644
--- a/palacios/src/palacios/vmx.c
+++ b/palacios/src/palacios/vmx.c
@@ -189,9 +189,9 @@ static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state)
 
 
     vmx_state->pri_proc_ctrls.hlt_exit = 1;
-    vmx_state->pri_proc_ctrls.invlpg_exit = 1;
 
-    vmx_state->pri_proc_ctrls.pause_exit = 1;
+
+    vmx_state->pri_proc_ctrls.pause_exit = 0;
     vmx_state->pri_proc_ctrls.tsc_offset = 1;
 #ifdef CONFIG_TIME_VIRTUALIZE_TSC
     vmx_state->pri_proc_ctrls.rdtsc_exit = 1;
@@ -249,6 +249,8 @@ static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state)
         vmx_state->pri_proc_ctrls.cr3_ld_exit = 1;
         vmx_state->pri_proc_ctrls.cr3_str_exit = 1;
 	
+	vmx_state->pri_proc_ctrls.invlpg_exit = 1;
+	
 	/* Add page fault exits */
 	vmx_state->excp_bmap.pf = 1;
 
@@ -267,12 +269,14 @@ static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state)
 
         // vmx_state->pinbased_ctrls |= NMI_EXIT;
 
-        /* Add CR exits */
-	//vmx_state->pri_proc_ctrls.cr3_ld_exit = 1;
-	//vmx_state->pri_proc_ctrls.cr3_str_exit = 1;
+        /* Disable CR exits */
+	vmx_state->pri_proc_ctrls.cr3_ld_exit = 0;
+	vmx_state->pri_proc_ctrls.cr3_str_exit = 0;
+
+	vmx_state->pri_proc_ctrls.invlpg_exit = 0;
 
 	/* Add page fault exits */
-	vmx_state->excp_bmap.pf = 1; // This should never happen..., enabled to catch bugs
+	//	vmx_state->excp_bmap.pf = 1; // This should never happen..., enabled to catch bugs
 	
 	// Setup VMX Assist
 	v3_vmxassist_init(core, vmx_state);
@@ -297,6 +301,7 @@ static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state)
 	int i = 0;
 	// For now we will assume that unrestricted guest mode is assured w/ EPT
 
+
 	core->vm_regs.rsp = 0x00;
 	core->rip = 0xfff0;
 	core->vm_regs.rdx = 0x00000f00;
@@ -368,6 +373,12 @@ static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state)
 	vmx_state->exit_ctrls.ld_efer = 1;
 	vmx_state->exit_ctrls.save_efer = 1;
 
+	/* Disable shadow paging stuff */
+	vmx_state->pri_proc_ctrls.cr3_ld_exit = 0;
+	vmx_state->pri_proc_ctrls.cr3_str_exit = 0;
+
+	vmx_state->pri_proc_ctrls.invlpg_exit = 0;
+
 
 	if (v3_init_ept(core, &hw_info) == -1) {
 	    PrintError("Error initializing EPT\n");