On 08/18/2010 10:36 AM, Avi Kivity wrote:
Signed-off-by: Avi Kivity<avi@xxxxxxxxxx> --- arch/x86/kvm/x86.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index f6a31a1..e2b0e36 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3967,6 +3967,7 @@ int kvm_inject_realmode_interrupt(struct kvm_vcpu *vcpu, int irq) vcpu->arch.emulate_ctxt.decode.op_bytes = 2; vcpu->arch.emulate_ctxt.decode.ad_bytes = 2; + vcpu->arch.emulate_ctxt.decode.eip = kvm_rip_read(vcpu); ret = emulate_int_real(&vcpu->arch.emulate_ctxt,&emulate_ops, irq); if (ret != X86EMUL_CONTINUE)
With this, the non-atomic-injection branch trips into an unemulated DAS instruction (when it doesn't inject an interrupt at the wrong place).
-- I have a truly marvellous patch that fixes the bug which this signature is too narrow to contain. -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
