commit 1e2b1dd797f9356f779268ecc1ba21110d4e341c
author Jan Kiszka <jan.kiszka@siemens.com> Mon Sep 12 10:52:24 2011 +0200
committer Avi Kivity <avi@redhat.com> Sun Sep 25 19:52:41 2011 +0300
tree 3a61d8c05758bfda30ab22a125c8b1af6d503ab1
parent caa8a168e35650961b9b0d43b9b6fc2279351949

KVM: x86: Move kvm_trace_exit into atomic vmexit section

This avoids that events causing the vmexit are recorded before the
actual exit reason.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

arch/x86/kvm/svm.c

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 8277f32..e7ed4b1 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -3335,8 +3335,6 @@
 	struct kvm_run *kvm_run = vcpu->run;
 	u32 exit_code = svm->vmcb->control.exit_code;
 
-	trace_kvm_exit(exit_code, vcpu, KVM_ISA_SVM);
-
 	if (!is_cr_intercept(svm, INTERCEPT_CR0_WRITE))
 		vcpu->arch.cr0 = svm->vmcb->save.cr0;
 	if (npt_enabled)
@@ -3790,6 +3788,8 @@
 	vcpu->arch.regs[VCPU_REGS_RSP] = svm->vmcb->save.rsp;
 	vcpu->arch.regs[VCPU_REGS_RIP] = svm->vmcb->save.rip;
 
+	trace_kvm_exit(svm->vmcb->control.exit_code, vcpu, KVM_ISA_SVM);
+
 	if (unlikely(svm->vmcb->control.exit_code == SVM_EXIT_NMI))
 		kvm_before_handle_nmi(&svm->vcpu);