Commit 93b6547e authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Marcelo Tosatti
Browse files

KVM: switch to symbolic name for irq_states size 



Use PIC_NUM_PINS instead of hard-coded 16 for pic pins.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent c7a7062f

arch/x86/kvm/irq.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

virt/kvm/irq_comm.c

+2 −2
Original line number Diff line number Diff line
@@ -343,11 +343,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: