]> bbs.cooldavid.org Git - net-next-2.6.git/commit - arch/x86/kvm/x86.c
git://bbs.cooldavid.org / net-next-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 49a9b07) | patch
KVM: Fix mov cr4 #GP at wrong instruction
authorAvi Kivity <avi@redhat.com>
Thu, 10 Jun 2010 14:02:15 +0000 (17:02 +0300)
committerAvi Kivity <avi@redhat.com>
Sun, 1 Aug 2010 07:46:34 +0000 (10:46 +0300)
commita83b29c6ad6d6497e569edbc29e556a384cebddd
tree444c440ec0e1f8e0d73d89cfc66fd185b03223c9tree | snapshot (tar.bz2 tar.gz zip)
parent49a9b07edcf4aff159c1f3d3a27e58cf38bc27cdcommit | diff
KVM: Fix mov cr4 #GP at wrong instruction

On Intel, we call skip_emulated_instruction() even if we injected a #GP,
resulting in the #GP pointing at the wrong address.

Fix by injecting the exception and skipping the instruction at the same place,
so we can do just one or the other.

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
arch/x86/include/asm/kvm_host.h diff | blob | blame | history
arch/x86/kvm/vmx.c diff | blob | blame | history
arch/x86/kvm/x86.c diff | blob | blame | history
Clone of davem's net-next-2.6 tree