From 43a0db3537583b269083c8ec20dbe3388510ae54 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Fri, 7 Oct 2011 09:19:36 +0200 Subject: 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 Signed-off-by: Blue Swirl --- hw/pc.h | 2 +- hw/pc_piix.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'hw') diff --git a/hw/pc.h b/hw/pc.h index 558d9a5..72f8c7c 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -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 e6e280c..c89042f 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); } -- cgit v1.1