Commit 43a0db35 authored by Jan Kiszka's avatar Jan Kiszka Committed by Blue Swirl
Browse files

pc: Convert GSIState::i8259_irq into array 



Will be required when we no longer let i8259_init allocate the PIC IRQs
but convert that chips to qdev.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent b881fbe9

hw/pc.h

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ void irq_info(Monitor *mon); 
#define GSI_NUM_PINS IOAPIC_NUM_PINS



typedef struct GSIState {

    qemu_irq *i8259_irq;

    qemu_irq i8259_irq[ISA_NUM_IRQS];

    qemu_irq ioapic_irq[IOAPIC_NUM_PINS];

} GSIState;

hw/pc_piix.c

+3 −1
Original line number Diff line number Diff line
@@ -158,7 +158,9 @@ static void pc_init1(MemoryRegion *system_memory, 
        i8259 = xen_interrupt_controller_init();

    }



    gsi_state->i8259_irq = i8259;

    for (i = 0; i < ISA_NUM_IRQS; i++) {

        gsi_state->i8259_irq[i] = i8259[i];

    }

    if (pci_enabled) {

        ioapic_init(gsi_state);

    }