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

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

KVM: nVMX: Lift sync_vmcs12() out of prepare_vmcs12() 



... to make it more obvious that sync_vmcs12() is invoked on all nested
VM-Exits, e.g. hiding sync_vmcs12() in prepare_vmcs12() makes it appear
that guest state is NOT propagated to vmcs12 for a normal VM-Exit.

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

arch/x86/kvm/vmx/nested.c

+3 −7
Original line number Diff line number Diff line
@@ -3500,11 +3500,7 @@ static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, 
			   u32 exit_reason, u32 exit_intr_info,

			   unsigned long exit_qualification)

{

	/* update guest state fields: */

	sync_vmcs12(vcpu, vmcs12);



	/* update exit information fields: */



	vmcs12->vm_exit_reason = exit_reason;

	vmcs12->exit_qualification = exit_qualification;

	vmcs12->vm_exit_intr_info = exit_intr_info;
@@ -3865,9 +3861,9 @@ void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason, 
		vcpu->arch.tsc_offset -= vmcs12->tsc_offset;



	if (likely(!vmx->fail)) {

		if (exit_reason == -1)

		sync_vmcs12(vcpu, vmcs12);

		else



		if (exit_reason != -1)

			prepare_vmcs12(vcpu, vmcs12, exit_reason, exit_intr_info,

				       exit_qualification);