Commit ae81d089 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: nVMX: Don't reset VMCS controls shadow on VMCS switch 



... now that the shadow copies are per-VMCS.

Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 09e226cf

arch/x86/kvm/vmx/nested.c

+0 −5
Original line number Diff line number Diff line
@@ -283,11 +283,6 @@ static void vmx_switch_vmcs(struct kvm_vcpu *vcpu, struct loaded_vmcs *vmcs) 
	vmx_sync_vmcs_host_state(vmx, prev);

	put_cpu();



	vm_entry_controls_reset_shadow(vmx);

	vm_exit_controls_reset_shadow(vmx);

	pin_controls_reset_shadow(vmx);

	exec_controls_reset_shadow(vmx);

	secondary_exec_controls_reset_shadow(vmx);

	vmx_segment_cache_clear(vmx);

}

arch/x86/kvm/vmx/vmx.h

+0 −4
Original line number Diff line number Diff line
@@ -388,10 +388,6 @@ static inline u8 vmx_get_rvi(void) 
}



#define BUILD_CONTROLS_SHADOW(lname, uname)				    \

static inline void lname##_controls_reset_shadow(struct vcpu_vmx *vmx)	    \

{									    \

	vmx->loaded_vmcs->controls_shadow.lname = vmcs_read32(uname);	    \

}									    \

static inline void lname##_controls_init(struct vcpu_vmx *vmx, u32 val)	    \

{									    \

	vmcs_write32(uname, val);					    \