[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/32] ich9: unify pic and ioapic IRQ vectors
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 12/32] ich9: unify pic and ioapic IRQ vectors |
Date: |
Tue, 28 Jun 2016 19:33:42 +0200 |
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 <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/i386/pc_q35.c | 3 +--
hw/isa/lpc_ich9.c | 4 ++--
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 65ae78a..6e296c0 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 2caa5e9..3bdb78d 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 f1294bc..a09a445 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);
--
2.7.4
- [Qemu-devel] [PULL 01/32] ide: move headers to include folder, (continued)
- [Qemu-devel] [PULL 01/32] ide: move headers to include folder, Paolo Bonzini, 2016/06/28
- [Qemu-devel] [PULL 02/32] pcspk: convert "pit" property type from ptr to link, Paolo Bonzini, 2016/06/28
- [Qemu-devel] [PULL 03/32] vmport: identify vmport type by macro TYPE_VMPORT, Paolo Bonzini, 2016/06/28
- [Qemu-devel] [PULL 05/32] Q35: implement property interfece to several parameters, Paolo Bonzini, 2016/06/28
- [Qemu-devel] [PULL 06/32] pc_q35: configure Q35 instance using properties, Paolo Bonzini, 2016/06/28
- [Qemu-devel] [PULL 04/32] pflash: make TYPE_CFI_PFLASH0{1, 2} macros public, Paolo Bonzini, 2016/06/28
- [Qemu-devel] [PULL 07/32] pckbd: handle A20 IRQ as GPIO, Paolo Bonzini, 2016/06/28
- [Qemu-devel] [PULL 08/32] port92: handle A20 IRQ as GPIO, Paolo Bonzini, 2016/06/28
- [Qemu-devel] [PULL 09/32] ICH9 SMB: make TYPE_ICH9_SMB_DEVICE macro public, Paolo Bonzini, 2016/06/28
- [Qemu-devel] [PULL 11/32] ich9: clean up ich9_lpc_update_pic/ich9_lpc_update_apic and callers, Paolo Bonzini, 2016/06/28
- [Qemu-devel] [PULL 12/32] ich9: unify pic and ioapic IRQ vectors,
Paolo Bonzini <=
- [Qemu-devel] [PULL 10/32] ich9: call ich9_lpc_update_pic for disabled pirqs, Paolo Bonzini, 2016/06/28
- [Qemu-devel] [PULL 13/32] ICH9 LPC: handle GSI as qdev GPIO, Paolo Bonzini, 2016/06/28
- [Qemu-devel] [PULL 14/32] ICH9 LPC: move call of isa_bus_irqs to 'realize' method, Paolo Bonzini, 2016/06/28
- [Qemu-devel] [PULL 16/32] MC146818 RTC: add GPIO access to output IRQ, Paolo Bonzini, 2016/06/28
- [Qemu-devel] [PULL 15/32] isa: introduce wrapper isa_connect_gpio_out, Paolo Bonzini, 2016/06/28
- [Qemu-devel] [PULL 17/32] scsi: esp: fix migration, Paolo Bonzini, 2016/06/28
- [Qemu-devel] [PULL 18/32] vnc: generalize "VNC server running on ..." message, Paolo Bonzini, 2016/06/28
- [Qemu-devel] [PULL 19/32] pci-assign: Move "Invalid ROM" error message to pci-assign-load-rom.c, Paolo Bonzini, 2016/06/28
- [Qemu-devel] [PULL 21/32] char: clean up remaining chardevs when leaving, Paolo Bonzini, 2016/06/28
- [Qemu-devel] [PULL 22/32] socket: add listen feature, Paolo Bonzini, 2016/06/28