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

Commit 5233dd51 authored by Marcelo Tosatti's avatar Marcelo Tosatti Committed by Avi Kivity
Browse files

KVM: VMX: do not overwrite uptodate vcpu->arch.cr3 on KVM_SET_SREGS 



Only decache guest CR3 value if vcpu->arch.cr3 is stale.
Fixes loadvm with live guest.

Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Tested-by: default avatarMarkus Schade <markus.schade@gmail.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent b7233635

arch/x86/kvm/vmx.c

+2 −1
Original line number Diff line number Diff line
@@ -2047,6 +2047,7 @@ static void ept_update_paging_mode_cr0(unsigned long *hw_cr0, 
					unsigned long cr0,

					struct kvm_vcpu *vcpu)

{

	if (!test_bit(VCPU_EXREG_CR3, (ulong *)&vcpu->arch.regs_avail))

		vmx_decache_cr3(vcpu);

	if (!(cr0 & X86_CR0_PG)) {

		/* From paging/starting to nonpaging */