X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmx_ctrl_regs.c;h=d83d51ffcca01772cfa8b6b8bbeb8d6ebbe24cef;hb=cfd5e43722796b4951faf721c64f3a74ab81ff2b;hp=afa0fb8ef0cfd7f641017092379ce03eebdc2cc4;hpb=ae0d9f72adc43c791ac13037285385fd8bb3c206;p=palacios.git

diff --git a/palacios/src/palacios/vmx_ctrl_regs.c b/palacios/src/palacios/vmx_ctrl_regs.c
index afa0fb8..d83d51f 100644
--- a/palacios/src/palacios/vmx_ctrl_regs.c
+++ b/palacios/src/palacios/vmx_ctrl_regs.c
@@ -27,7 +27,7 @@
 #include <palacios/vmm_direct_paging.h>
 #include <palacios/vmm_ctrl_regs.h>
 
-#ifndef CONFIG_DEBUG_VMX
+#ifndef V3_CONFIG_DEBUG_VMX
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -77,6 +77,29 @@ int v3_vmx_handle_cr3_access(struct guest_info * info, struct vmx_exit_cr_qual *
     return -1;
 }
 
+int v3_vmx_handle_cr4_access(struct guest_info * info, struct vmx_exit_cr_qual * cr_qual) {
+    if (cr_qual->access_type < 2) {
+
+	if (cr_qual->access_type == 0) {
+	    if (v3_handle_cr4_write(info) != 0) {
+		PrintError("Could not handle CR4 write\n");
+		return -1;
+	    }
+	    info->ctrl_regs.cr4 |= 0x2000; // no VMX allowed in guest, so mask CR4.VMXE
+	} else {
+	    if (v3_handle_cr4_read(info) != 0) {
+		PrintError("Could not handle CR4 read\n");
+		return -1;
+	    }
+	}
+
+	return 0;
+    }
+
+    PrintError("Invalid CR4 Access type?? (type=%d)\n", cr_qual->access_type);
+    return -1;
+}
+
 static int handle_mov_to_cr3(struct guest_info * info, v3_reg_t * cr3_reg) {
 
     if (info->shdw_pg_mode == SHADOW_PAGING) {
@@ -161,7 +184,7 @@ static int handle_mov_to_cr0(struct guest_info * info, v3_reg_t * new_cr0, struc
             return -1;
         }
 	
-        if (vmx_info->state == VMXASSIST_ENABLED) {
+        if (vmx_info->assist_state == VMXASSIST_ENABLED) {
             PrintDebug("Loading VMXASSIST at RIP: %p\n", (void *)(addr_t)info->rip);
         } else {
             PrintDebug("Leaving VMXASSIST and entering protected mode at RIP: %p\n",
@@ -192,31 +215,42 @@ static int handle_mov_to_cr0(struct guest_info * info, v3_reg_t * new_cr0, struc
 	guest_cr0->pg = 1;
 	guest_cr0->ne = 1;
 	
-	if (paging_transition) {
+	if ((paging_transition)) {
 	    // Paging transition
 	    
 	    if (v3_get_vm_mem_mode(info) == VIRTUAL_MEM) {
-		struct efer_64 * guest_efer = (struct efer_64 *)&(info->ctrl_regs.efer);
+		struct efer_64 * vm_efer = (struct efer_64 *)&(info->shdw_pg_state.guest_efer);
+		struct efer_64 * hw_efer = (struct efer_64 *)&(info->ctrl_regs.efer);
 		
-		if (guest_efer->lme == 1) {
+		if (vm_efer->lme) {
 		    //     PrintDebug("Enabling long mode\n");
 		    
-		    guest_efer->lma = 1;
-		    guest_efer->lme = 1;
+		    hw_efer->lma = 1;
+		    hw_efer->lme = 1;
 		    
 		    vmx_info->entry_ctrls.guest_ia32e = 1;
 		}
 		
 		//            PrintDebug("Activating Shadow Page tables\n");
 		
-		if (v3_activate_shadow_pt(info) == -1) {
-		    PrintError("Failed to activate shadow page tables\n");
-		    return -1;
+		if (info->shdw_pg_mode == SHADOW_PAGING) {
+		    if (v3_activate_shadow_pt(info) == -1) {
+			PrintError("Failed to activate shadow page tables\n");
+			return -1;
+		    }
 		}
 		
-	    } else if (v3_activate_passthrough_pt(info) == -1) {
-		PrintError("Failed to activate passthrough page tables\n");
-		return -1;
+	    } else {
+
+		if (info->shdw_pg_mode == SHADOW_PAGING) {
+		    if (v3_activate_passthrough_pt(info) == -1) {
+			PrintError("Failed to activate passthrough page tables\n");
+			return -1;
+		    }
+		} else {
+		    // This is hideous... Let's hope that the 1to1 page table has not been nuked...
+		    info->ctrl_regs.cr3 = VMXASSIST_1to1_PT;
+		}
 	    }
 	}
     }