lkml.org 
[lkml]   [2012]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] kvm: switch to symbolic name for irq_states size
    Use PIC_NUM_PINS instead of hard-coded 16 for pic pins.

    Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
    ---
    arch/x86/kvm/irq.h | 2 +-
    virt/kvm/irq_comm.c | 4 ++--
    2 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h
    index 2086f2b..2d03568 100644
    --- a/arch/x86/kvm/irq.h
    +++ b/arch/x86/kvm/irq.h
    @@ -70,7 +70,7 @@ struct kvm_pic {
    struct kvm_io_device dev_slave;
    struct kvm_io_device dev_eclr;
    void (*ack_notifier)(void *opaque, int irq);
    - unsigned long irq_states[16];
    + unsigned long irq_states[PIC_NUM_PINS];
    };

    struct kvm_pic *kvm_create_pic(struct kvm *kvm);
    diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c
    index 83402d7..7118be0 100644
    --- a/virt/kvm/irq_comm.c
    +++ b/virt/kvm/irq_comm.c
    @@ -321,11 +321,11 @@ static int setup_routing_entry(struct kvm_irq_routing_table *rt,
    switch (ue->u.irqchip.irqchip) {
    case KVM_IRQCHIP_PIC_MASTER:
    e->set = kvm_set_pic_irq;
    - max_pin = 16;
    + max_pin = PIC_NUM_PINS;
    break;
    case KVM_IRQCHIP_PIC_SLAVE:
    e->set = kvm_set_pic_irq;
    - max_pin = 16;
    + max_pin = PIC_NUM_PINS;
    delta = 8;
    break;
    case KVM_IRQCHIP_IOAPIC:
    --
    MST

    \
     
     \ /
      Last update: 2012-07-19 13:21    [W:2.532 / U:0.572 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site