lkml.org 
[lkml]   [2010]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 21/40] KVM: powerpc: Move vector to irqprio resolving to separate function
    Date
    From: Alexander Graf <agraf@suse.de>

    We're using a switch table to find the irqprio that belongs to a specific
    interrupt vector. This table is part of the interrupt inject logic.

    Since we'll add a new function to stop interrupts, let's move this table
    out of the injection logic into a separate function.

    Signed-off-by: Alexander Graf <agraf@suse.de>
    Acked-by: Acked-by: Hollis Blanchard <hollis@penguinppc.org>
    Signed-off-by: Avi Kivity <avi@redhat.com>
    ---
    arch/powerpc/kvm/book3s.c | 13 ++++++++++---
    1 files changed, 10 insertions(+), 3 deletions(-)

    diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c
    index 3e294bd..241795b 100644
    --- a/arch/powerpc/kvm/book3s.c
    +++ b/arch/powerpc/kvm/book3s.c
    @@ -125,11 +125,10 @@ void kvmppc_inject_interrupt(struct kvm_vcpu *vcpu, int vec, u64 flags)
    vcpu->arch.mmu.reset_msr(vcpu);
    }

    -void kvmppc_book3s_queue_irqprio(struct kvm_vcpu *vcpu, unsigned int vec)
    +static int kvmppc_book3s_vec2irqprio(unsigned int vec)
    {
    unsigned int prio;

    - vcpu->stat.queue_intr++;
    switch (vec) {
    case 0x100: prio = BOOK3S_IRQPRIO_SYSTEM_RESET; break;
    case 0x200: prio = BOOK3S_IRQPRIO_MACHINE_CHECK; break;
    @@ -149,7 +148,15 @@ void kvmppc_book3s_queue_irqprio(struct kvm_vcpu *vcpu, unsigned int vec)
    default: prio = BOOK3S_IRQPRIO_MAX; break;
    }

    - set_bit(prio, &vcpu->arch.pending_exceptions);
    + return prio;
    +}
    +
    +void kvmppc_book3s_queue_irqprio(struct kvm_vcpu *vcpu, unsigned int vec)
    +{
    + vcpu->stat.queue_intr++;
    +
    + set_bit(kvmppc_book3s_vec2irqprio(vec),
    + &vcpu->arch.pending_exceptions);
    #ifdef EXIT_DEBUG
    printk(KERN_INFO "Queueing interrupt %x\n", vec);
    #endif
    --
    1.6.5.3


    \
     
     \ /
      Last update: 2010-02-10 18:45    [W:0.037 / U:63.232 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site