diff options
| author | Huw Davies <huw@codeweavers.com> | 2014-04-16 10:02:51 +0100 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2014-04-22 18:37:43 -0300 |
| commit | fd2a445a94d2ab6b39fb623dc02fee48d01a565a (patch) | |
| tree | 82f5f73c92f313a19c756ee9664783fa6268dc37 | |
| parent | 63b5cf04f4ede6046cc8771789e5ac40529f30e8 (diff) | |
| download | op-kernel-dev-fd2a445a94d2ab6b39fb623dc02fee48d01a565a.zip op-kernel-dev-fd2a445a94d2ab6b39fb623dc02fee48d01a565a.tar.gz | |
KVM: VMX: Advance rip to after an ICEBP instruction
When entering an exception after an ICEBP, the saved instruction
pointer should point to after the instruction.
This fixes the bug here: https://bugs.launchpad.net/qemu/+bug/1119686
Signed-off-by: Huw Davies <huw@codeweavers.com>
Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| -rw-r--r-- | arch/x86/kvm/vmx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index eb3f2b1..8fb56e4 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -4841,6 +4841,9 @@ static int handle_exception(struct kvm_vcpu *vcpu) (KVM_GUESTDBG_SINGLESTEP | KVM_GUESTDBG_USE_HW_BP))) { vcpu->arch.dr6 &= ~15; vcpu->arch.dr6 |= dr6; + if (!(dr6 & ~DR6_RESERVED)) /* icebp */ + skip_emulated_instruction(vcpu); + kvm_queue_exception(vcpu, DB_VECTOR); return 1; } |
