X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_ctrl_regs.c;fp=palacios%2Fsrc%2Fpalacios%2Fvmm_ctrl_regs.c;h=5975dafbec16244e32a20207ccb2488642215feb;hp=bc768ac5aaa1bc2449a50060d6ada207f88340b3;hb=6dee811714540921f73487de80e069decb80c602;hpb=eb374e3056008d7be7119e2217f1ab1802f444d2 diff --git a/palacios/src/palacios/vmm_ctrl_regs.c b/palacios/src/palacios/vmm_ctrl_regs.c index bc768ac..5975daf 100644 --- a/palacios/src/palacios/vmm_ctrl_regs.c +++ b/palacios/src/palacios/vmm_ctrl_regs.c @@ -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 @@ -541,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; @@ -556,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);