lkml.org 
[lkml]   [2008]   [Sep]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/39] KVM: VMX: Use interrupt queue for !irqchip_in_kernel
    Date
    From: Avi Kivity <avi@qumranet.com>

    Signed-off-by: Avi Kivity <avi@qumranet.com>
    ---
    arch/x86/kvm/vmx.c | 11 +++++------
    1 files changed, 5 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
    index 229e2d0..81db7d4 100644
    --- a/arch/x86/kvm/vmx.c
    +++ b/arch/x86/kvm/vmx.c
    @@ -2173,7 +2173,7 @@ static void kvm_do_inject_irq(struct kvm_vcpu *vcpu)
    clear_bit(bit_index, &vcpu->arch.irq_pending[word_index]);
    if (!vcpu->arch.irq_pending[word_index])
    clear_bit(word_index, &vcpu->arch.irq_summary);
    - vmx_inject_irq(vcpu, irq);
    + kvm_queue_interrupt(vcpu, irq);
    }


    @@ -2187,13 +2187,12 @@ static void do_interrupt_requests(struct kvm_vcpu *vcpu,
    (vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) & 3) == 0);

    if (vcpu->arch.interrupt_window_open &&
    - vcpu->arch.irq_summary &&
    - !(vmcs_read32(VM_ENTRY_INTR_INFO_FIELD) & INTR_INFO_VALID_MASK))
    - /*
    - * If interrupts enabled, and not blocked by sti or mov ss. Good.
    - */
    + vcpu->arch.irq_summary && !vcpu->arch.interrupt.pending)
    kvm_do_inject_irq(vcpu);

    + if (vcpu->arch.interrupt_window_open && vcpu->arch.interrupt.pending)
    + vmx_inject_irq(vcpu, vcpu->arch.interrupt.nr);
    +
    cpu_based_vm_exec_control = vmcs_read32(CPU_BASED_VM_EXEC_CONTROL);
    if (!vcpu->arch.interrupt_window_open &&
    (vcpu->arch.irq_summary || kvm_run->request_interrupt_window))
    --
    1.6.0.1


    \
     
     \ /
      Last update: 2008-09-25 13:59    [W:0.023 / U:0.120 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site