X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_ctrl_regs.c;h=ba6e9c5ebeb42589cca5389988d66f983b328707;hb=a536ac8d7eef843551087eaf8788e0a41f2a2c0a;hp=bdb6e127804fa82a105de06b8b7a1fc3d5ac5d3a;hpb=39849abeb743c4e6b669a790c307979fa8d51884;p=palacios.git

diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c
index bdb6e12..ba6e9c5 100644
--- a/palacios/src/palacios/vmm_ctrl_regs.c
+++ b/palacios/src/palacios/vmm_ctrl_regs.c
@@ -25,7 +25,7 @@
 #include <palacios/vmm_ctrl_regs.h>
 #include <palacios/vmm_direct_paging.h>
 
-#ifndef DEBUG_CTRL_REGS
+#ifndef CONFIG_DEBUG_CTRL_REGS
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -120,7 +120,7 @@ static int handle_mov_to_cr0(struct guest_info * info, struct x86_instr * dec_in
     if (paging_transition) {
 	if (v3_get_vm_mem_mode(info) == VIRTUAL_MEM) {
 	    
-	    struct efer_64 * guest_efer  = (struct efer_64 *)&(info->guest_efer);
+	    struct efer_64 * guest_efer  = (struct efer_64 *)&(info->shdw_pg_state.guest_efer);
 	    struct efer_64 * shadow_efer = (struct efer_64 *)&(info->ctrl_regs.efer);
 	    
 	    // Check long mode LME to set LME
@@ -140,7 +140,7 @@ static int handle_mov_to_cr0(struct guest_info * info, struct x86_instr * dec_in
 		PrintError("Failed to activate shadow page tables\n");
 		return -1;
 	    }
-	} else  {
+	} else {
 	    
 	    if (v3_activate_passthrough_pt(info) == -1) {
 		PrintError("Failed to activate passthrough page tables\n");
@@ -495,6 +495,7 @@ int v3_handle_cr4_write(struct guest_info * info) {
 		    
 		} else if ((cr4->pae == 1) && (new_cr4->pae == 0)) {
 		    // Create passthrough standard 32bit pagetables
+		    PrintError("Switching From PAE to Protected mode not supported\n");
 		    return -1;
 		} 
 	    }
@@ -512,7 +513,7 @@ int v3_handle_cr4_write(struct guest_info * info) {
 	
 	if (new_cr4->pae == 0) {
 	    // cannot turn off PAE in long mode GPF the guest
-	    PrintError("Cannot disable PAE in long mode, sending GPF\n");
+	    PrintError("Cannot disable PAE in long mode, should send GPF\n");
 	    return -1;
 	}
 	
@@ -540,9 +541,9 @@ int v3_handle_cr4_write(struct guest_info * info) {
 
 int v3_handle_efer_read(uint_t msr, struct v3_msr * dst, void * priv_data) {
     struct guest_info * info = (struct guest_info *)(priv_data);
-    PrintDebug("EFER Read HI=%x LO=%x\n", info->guest_efer.hi, info->guest_efer.lo);
+    PrintDebug("EFER Read HI=%x LO=%x\n", info->shdw_pg_state.guest_efer.hi, info->shdw_pg_state.guest_efer.lo);
     
-    dst->value = info->guest_efer.value;
+    dst->value = info->shdw_pg_state.guest_efer.value;
     
     info->rip += 2; // WRMSR/RDMSR are two byte operands
     return 0;
@@ -555,7 +556,7 @@ int v3_handle_efer_write(uint_t msr, struct v3_msr src, void * priv_data) {
     struct guest_info * info = (struct guest_info *)(priv_data);
     //struct efer_64 * new_efer = (struct efer_64 *)&(src.value);
     struct efer_64 * shadow_efer = (struct efer_64 *)&(info->ctrl_regs.efer);
-    struct v3_msr * guest_efer = &(info->guest_efer);
+    struct v3_msr * guest_efer = &(info->shdw_pg_state.guest_efer);
     
     PrintDebug("EFER Write\n");
     PrintDebug("EFER Write Values: HI=%x LO=%x\n", src.hi, src.lo);