aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGleb Natapov <gleb@redhat.com>2010-05-23 14:28:26 +0300
committerAvi Kivity <avi@redhat.com>2010-08-01 10:35:51 +0300
commit9fb2d2b4ff292a01ae30da003d1dc097917b0988 (patch)
treebcbbf1f07edfc1f31168801b9e1be0b5d7184597
parentf78978aa3a8222f7822f15fba5dbaea990ef0887 (diff)
downloadmrst-s0i3-test-9fb2d2b4ff292a01ae30da003d1dc097917b0988.tar.gz
mrst-s0i3-test-9fb2d2b4ff292a01ae30da003d1dc097917b0988.tar.xz
mrst-s0i3-test-9fb2d2b4ff292a01ae30da003d1dc097917b0988.zip
KVM: SVM: correctly trace irq injection
On SVM interrupts are injected by svm_set_irq() not svm_inject_irq(). The later is used only to wait for irq window. Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r--arch/x86/kvm/svm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 134260c36ce..f5c2b432078 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -2917,9 +2917,6 @@ static inline void svm_inject_irq(struct vcpu_svm *svm, int irq)
{
struct vmcb_control_area *control;
- trace_kvm_inj_virq(irq);
-
- ++svm->vcpu.stat.irq_injections;
control = &svm->vmcb->control;
control->int_vector = irq;
control->int_ctl &= ~V_INTR_PRIO_MASK;
@@ -2933,6 +2930,9 @@ static void svm_set_irq(struct kvm_vcpu *vcpu)
BUG_ON(!(gif_set(svm)));
+ trace_kvm_inj_virq(vcpu->arch.interrupt.nr);
+ ++vcpu->stat.irq_injections;
+
svm->vmcb->control.event_inj = vcpu->arch.interrupt.nr |
SVM_EVTINJ_VALID | SVM_EVTINJ_TYPE_INTR;
}