Commit fd2a445a authored Apr 16, 2014 by Huw Davies Committed by Marcelo Tosatti Apr 22, 2014

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>

parent 63b5cf04

arch/x86/kvm/vmx.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}