diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2011-10-07 09:19:36 +0200 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-10-16 11:10:52 +0000 |
| commit | 43a0db3537583b269083c8ec20dbe3388510ae54 (patch) | |
| tree | b86c2ad4d31e06c2ceddba38e685a35265cb3b74 | |
| parent | b881fbe9f7a60ceaef20b7a234c49473d009bf4d (diff) | |
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: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | hw/pc.h | 2 | ||||
| -rw-r--r-- | hw/pc_piix.c | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -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; diff --git a/hw/pc_piix.c b/hw/pc_piix.c index e6e280c55b..c89042f1ce 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -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); } |