diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2012-07-19 06:55:53 -0400 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-07-20 15:12:16 -0400 |
| commit | 93b6547e2219784b2df790353e083e0bdbebd2c2 (patch) | |
| tree | b84f3d4fdc919f58687e54c65d5738e0c0be7a6e | |
| parent | c7a7062fa00db7dc66280a72cd9dad0f3595bc66 (diff) | |
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>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| -rw-r--r-- | arch/x86/kvm/irq.h | 2 | ||||
| -rw-r--r-- | 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 2086f2bfba33..2d03568e9498 100644 --- a/arch/x86/kvm/irq.h +++ b/arch/x86/kvm/irq.h | |||
| @@ -70,7 +70,7 @@ struct kvm_pic { | |||
| 70 | struct kvm_io_device dev_slave; | 70 | struct kvm_io_device dev_slave; |
| 71 | struct kvm_io_device dev_eclr; | 71 | struct kvm_io_device dev_eclr; |
| 72 | void (*ack_notifier)(void *opaque, int irq); | 72 | void (*ack_notifier)(void *opaque, int irq); |
| 73 | unsigned long irq_states[16]; | 73 | unsigned long irq_states[PIC_NUM_PINS]; |
| 74 | }; | 74 | }; |
| 75 | 75 | ||
| 76 | struct kvm_pic *kvm_create_pic(struct kvm *kvm); | 76 | struct kvm_pic *kvm_create_pic(struct kvm *kvm); |
diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c index a6a0365475ed..22aae8fd146b 100644 --- a/virt/kvm/irq_comm.c +++ b/virt/kvm/irq_comm.c | |||
| @@ -343,11 +343,11 @@ static int setup_routing_entry(struct kvm_irq_routing_table *rt, | |||
| 343 | switch (ue->u.irqchip.irqchip) { | 343 | switch (ue->u.irqchip.irqchip) { |
| 344 | case KVM_IRQCHIP_PIC_MASTER: | 344 | case KVM_IRQCHIP_PIC_MASTER: |
| 345 | e->set = kvm_set_pic_irq; | 345 | e->set = kvm_set_pic_irq; |
| 346 | max_pin = 16; | 346 | max_pin = PIC_NUM_PINS; |
| 347 | break; | 347 | break; |
| 348 | case KVM_IRQCHIP_PIC_SLAVE: | 348 | case KVM_IRQCHIP_PIC_SLAVE: |
| 349 | e->set = kvm_set_pic_irq; | 349 | e->set = kvm_set_pic_irq; |
| 350 | max_pin = 16; | 350 | max_pin = PIC_NUM_PINS; |
| 351 | delta = 8; | 351 | delta = 8; |
| 352 | break; | 352 | break; |
| 353 | case KVM_IRQCHIP_IOAPIC: | 353 | case KVM_IRQCHIP_IOAPIC: |
