diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-06-17 17:12:09 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-06-29 14:03:46 +0200 |
| commit | 35a6b23c824e54055f1a2ab30fa5b051a82cdda6 (patch) | |
| tree | 2167b74a2c8ecd312dd18cf97599134957d4cfb0 | |
| parent | a94dd6a9d693829bf8fb04cd6d85c797ed90a5d7 (diff) | |
| download | focaccia-qemu-35a6b23c824e54055f1a2ab30fa5b051a82cdda6.tar.gz focaccia-qemu-35a6b23c824e54055f1a2ab30fa5b051a82cdda6.zip | |
ich9: unify pic and ioapic IRQ vectors
ich9->pic and ich9->ioapic differ for the first 16 GSIs (because ich9->pic is wired to 8259+IOAPIC but ich9->ioapic is wired to IOAPIC only). However, ich9->ioapic is never used for the first 16 GSIs, so the two vectors can be merged. Reviewed-by: Efimov Vasily <real@ispras.ru> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | hw/i386/pc_q35.c | 3 | ||||
| -rw-r--r-- | hw/isa/lpc_ich9.c | 4 | ||||
| -rw-r--r-- | include/hw/i386/ich9.h | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 65ae78a270..6e296c0c32 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -190,8 +190,7 @@ static void pc_q35_init(MachineState *machine) PC_MACHINE_ACPI_DEVICE_PROP, &error_abort); ich9_lpc = ICH9_LPC_DEVICE(lpc); - ich9_lpc->pic = gsi; - ich9_lpc->ioapic = gsi_state->ioapic_irq; + ich9_lpc->gsi = gsi; pci_bus_irqs(host_bus, ich9_lpc_set_irq, ich9_lpc_map_irq, ich9_lpc, ICH9_LPC_NB_PIRQS); pci_bus_set_route_irq_fn(host_bus, ich9_route_intx_pin_to_irq); diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 2caa5e9691..3bdb78d255 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -225,7 +225,7 @@ static void ich9_lpc_update_pic(ICH9LPCState *lpc, int gsi) pic_level |= lpc->sci_level; } - qemu_set_irq(lpc->pic[gsi], pic_level); + qemu_set_irq(lpc->gsi[gsi], pic_level); } /* APIC mode: GSIx: PIRQ[A-H] -> GSI 16, ... no pirq shares same APIC pins. */ @@ -251,7 +251,7 @@ static void ich9_lpc_update_apic(ICH9LPCState *lpc, int gsi) level |= lpc->sci_level; } - qemu_set_irq(lpc->ioapic[gsi], level); + qemu_set_irq(lpc->gsi[gsi], level); } void ich9_lpc_set_irq(void *opaque, int pirq, int level) diff --git a/include/hw/i386/ich9.h b/include/hw/i386/ich9.h index f1294bc505..a09a4459e7 100644 --- a/include/hw/i386/ich9.h +++ b/include/hw/i386/ich9.h @@ -68,8 +68,7 @@ typedef struct ICH9LPCState { MemoryRegion rcrb_mem; /* root complex register block */ Notifier machine_ready; - qemu_irq *pic; - qemu_irq *ioapic; + qemu_irq *gsi; } ICH9LPCState; Object *ich9_lpc_find(void); |