summaryrefslogtreecommitdiff
path: root/arch/x86/kvm/svm.c
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2011-03-07 11:40:21 +0300
committerJens Axboe <jaxboe@fusionio.com>2011-03-07 11:40:21 +0300
commitb873c5d692d4d5453cceed18bb06c62bb1a73ac0 (patch)
treef9d5816bc26ced37f187a141ee6c74c7b8e00fcf /arch/x86/kvm/svm.c
parenta60327107b56573c305ecc78e471dbdbb4d2f426 (diff)
parente83a46bbb1d4c03defd733a64b727632a40059ad (diff)
downloadlinux-b873c5d692d4d5453cceed18bb06c62bb1a73ac0.tar.xz
Merge branch 'block-for-2.6.39-core' of ssh://master.kernel.org/pub/scm/linux/kernel/git/tj/misc into for-2.6.39/core
Diffstat (limited to 'arch/x86/kvm/svm.c')
-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 54ce246a383e..63fec1531e89 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;
}