diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2011-09-12 10:52:24 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-09-25 18:52:41 +0200 |
| commit | 1e2b1dd797f9356f779268ecc1ba21110d4e341c (patch) | |
| tree | 3a61d8c05758bfda30ab22a125c8b1af6d503ab1 /arch/x86/kvm/svm.c | |
| parent | KVM: x86 emulator: disable writeback for TEST (diff) | |
| download | linux-1e2b1dd797f9356f779268ecc1ba21110d4e341c.tar.xz linux-1e2b1dd797f9356f779268ecc1ba21110d4e341c.zip | |
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>
Diffstat (limited to 'arch/x86/kvm/svm.c')
| -rw-r--r-- | arch/x86/kvm/svm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 8277f32017ad..e7ed4b1623b9 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -3335,8 +3335,6 @@ static int handle_exit(struct kvm_vcpu *vcpu) 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 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu) 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); |