Skip to content

Commit

Permalink
Merge branch 'kvm-updates/2.6.38' of git://git.kernel.org/pub/scm/vir…
Browse files Browse the repository at this point in the history
…t/kvm/kvm

* 'kvm-updates/2.6.38' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: SVM: Advance instruction pointer in dr_intercept
  • Loading branch information
Linus Torvalds committed Feb 24, 2011
2 parents 9f0939b + 2c46d2a commit 86e2fe9
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/x86/kvm/svm.c
Original file line number Diff line number Diff line change
Expand Up @@ -2777,6 +2777,8 @@ static int dr_interception(struct vcpu_svm *svm)
kvm_register_write(&svm->vcpu, reg, val);
}

skip_emulated_instruction(&svm->vcpu);

return 1;
}

Expand Down

0 comments on commit 86e2fe9

Please sign in to comment.