From 1632dc6a8f6e8662f4a203b6fb8c0371ca216946 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Sun, 9 Aug 2009 19:44:56 +0300 Subject: Route IOAPIC interrupts via ISA bus Instead of calling the IOAPIC from the PIC, raise IOAPIC irqs via the ISA bus. As a side effect, IOAPIC lines 16-23 are enabled. Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori --- hw/ioapic.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'hw/ioapic.c') diff --git a/hw/ioapic.c b/hw/ioapic.c index a5cdd5d9a7..998894de18 100644 --- a/hw/ioapic.c +++ b/hw/ioapic.c @@ -241,9 +241,10 @@ static CPUWriteMemoryFunc *ioapic_mem_write[3] = { ioapic_mem_writel, }; -IOAPICState *ioapic_init(void) +qemu_irq *ioapic_init(void) { IOAPICState *s; + qemu_irq *irq; int io_memory; s = qemu_mallocz(sizeof(IOAPICState)); @@ -255,6 +256,7 @@ IOAPICState *ioapic_init(void) register_savevm("ioapic", 0, 1, ioapic_save, ioapic_load, s); qemu_register_reset(ioapic_reset, s); + irq = qemu_allocate_irqs(ioapic_set_irq, s, IOAPIC_NUM_PINS); - return s; + return irq; } -- cgit 1.4.1