summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-24 12:22:14 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-24 12:22:14 -0800
commit86e2fe9ff3f3eebca2066bcfc2d993f61af787f5 (patch)
tree560dfeb27813e95739a12d2cef09a4029af51fd1 /arch
parent9f0939bf498273b91f79a8ec2f2aa773f8615bb8 (diff)
parent2c46d2aec054e61a33feac8c3992218eabdcc22a (diff)
downloadlinux-3.10-86e2fe9ff3f3eebca2066bcfc2d993f61af787f5.tar.gz
linux-3.10-86e2fe9ff3f3eebca2066bcfc2d993f61af787f5.tar.bz2
linux-3.10-86e2fe9ff3f3eebca2066bcfc2d993f61af787f5.zip
Merge branch 'kvm-updates/2.6.38' of git://git.kernel.org/pub/scm/virt/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
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kvm/svm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 54ce246a383..63fec1531e8 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -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;
}