[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 03/23] pc: Convert GSIState::i8259_irq into array
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v2 03/23] pc: Convert GSIState::i8259_irq into array |
Date: |
Fri, 7 Oct 2011 09:19:36 +0200 |
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 <address@hidden>
---
hw/pc.h | 2 +-
hw/pc_piix.c | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/pc.h b/hw/pc.h
index 4333898..2870be4 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);
}
--
1.7.3.4
- [Qemu-devel] [PATCH v2 00/23] Rework i8259 and PC interrupt models, Jan Kiszka, 2011/10/07
- [Qemu-devel] [PATCH v2 01/23] pc: Drop useless test from isa_irq_handler, Jan Kiszka, 2011/10/07
- [Qemu-devel] [PATCH v2 03/23] pc: Convert GSIState::i8259_irq into array,
Jan Kiszka <=
- [Qemu-devel] [PATCH v2 05/23] i8259: Remove premature inline function attributes, Jan Kiszka, 2011/10/07
- [Qemu-devel] [PATCH v2 06/23] i8259: Drop obsolete prototypes, Jan Kiszka, 2011/10/07
- [Qemu-devel] [PATCH v2 04/23] pc: Fix and clean up PIC-to-APIC IRQ path, Jan Kiszka, 2011/10/07
- [Qemu-devel] [PATCH v2 08/23] i8239: Introduce per-PIC output interrupt, Jan Kiszka, 2011/10/07
- [Qemu-devel] [PATCH v2 07/23] i8259: Move pic_set_irq1 after pic_update_irq, Jan Kiszka, 2011/10/07
- [Qemu-devel] [PATCH v2 11/23] i8259: Update IRQ state after reset, Jan Kiszka, 2011/10/07
- [Qemu-devel] [PATCH v2 10/23] i8259: Reorder intack in pic_read_irq, Jan Kiszka, 2011/10/07
- [Qemu-devel] [PATCH v2 09/23] i8259: Do not update IRQ output after spurious pic_poll_read, Jan Kiszka, 2011/10/07
- [Qemu-devel] [PATCH v2 13/23] i8259: Switch to per-PIC IRQ update, Jan Kiszka, 2011/10/07
- [Qemu-devel] [PATCH v2 15/23] i8259: Clean up pic_ioport_read, Jan Kiszka, 2011/10/07