Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e3e4dbf authored by Jan Kiszka's avatar Jan Kiszka Committed by Paolo Bonzini
Browse files

KVM: nVMX: Replace kvm_set_cr0 with vmx_set_cr0 in load_vmcs12_host_state 



kvm_set_cr0 performs checks on the state transition that may prevent
loading L1's cr0. For now we rely on the hardware to catch invalid
states loaded by L1 into its VMCS. Still, consistency checks on the host
state part of the VMCS on guest entry will have to be improved later on.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 98fda169

arch/x86/kvm/vmx.c

+1 −1
Original line number Diff line number Diff line
@@ -8199,7 +8199,7 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu, 
	 * fpu_active (which may have changed).

	 * Note that vmx_set_cr0 refers to efer set above.

	 */

	kvm_set_cr0(vcpu, vmcs12->host_cr0);

	vmx_set_cr0(vcpu, vmcs12->host_cr0);

	/*

	 * If we did fpu_activate()/fpu_deactivate() during L2's run, we need

	 * to apply the same changes to L1's vmcs. We just set cr0 correctly,