various changes...

[palacios.git] / palacios / src / palacios / vmm_ctrl_regs.c

diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c
index 5975daf..d3e9360 100644 (file)
--- 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
@@ -141,6 +141,8 @@ static int handle_mov_to_cr0(struct guest_info * info, struct x86_instr * dec_in
                return -1;
            }
        } else {
+
+           shadow_cr0->wp = 1;
            
            if (v3_activate_passthrough_pt(info) == -1) {
                PrintError("Failed to activate passthrough page tables\n");
@@ -320,14 +322,15 @@ int v3_handle_cr3_write(struct guest_info * info) {
                struct cr3_32 * guest_cr3 = (struct cr3_32 *)&(info->shdw_pg_state.guest_cr3);
                *guest_cr3 = *new_cr3;
            }
-           
+
+
            // If Paging is enabled in the guest then we need to change the shadow page tables
            if (info->mem_mode == VIRTUAL_MEM) {
                if (v3_activate_shadow_pt(info) == -1) {
                    PrintError("Failed to activate 32 bit shadow page table\n");
                    return -1;
                }
-           } 
+           }
            
            PrintDebug("New Shadow CR3=%p; New Guest CR3=%p\n", 
                       (void *)(addr_t)(info->ctrl_regs.cr3), 
@@ -545,7 +548,6 @@ int v3_handle_efer_read(uint_t msr, struct v3_msr * dst, void * priv_data) {
     
     dst->value = info->shdw_pg_state.guest_efer.value;
     
-    info->rip += 2; // WRMSR/RDMSR are two byte operands
     return 0;
 }
 
@@ -569,7 +571,5 @@ int v3_handle_efer_write(uint_t msr, struct v3_msr src, void * priv_data) {
     // Enable/Disable Syscall
     shadow_efer->sce = src.value & 0x1;
     
-    info->rip += 2; // WRMSR/RDMSR are two byte operands
-    
     return 0;
 }