diff options
| author | Jason Baron <jbaron@redhat.com> | 2012-11-14 15:54:01 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-26 09:35:35 -0600 |
| commit | a39e356458335418973ca7d388c02712145cd177 (patch) | |
| tree | 3a56ce58d1286b95b36c3ddacb0d68b815d29016 /hw/pc_piix.c | |
| parent | 9011a1a7bbf00deeada3447143bbde7e0a685297 (diff) | |
| download | qemu-a39e356458335418973ca7d388c02712145cd177.zip qemu-a39e356458335418973ca7d388c02712145cd177.tar.gz qemu-a39e356458335418973ca7d388c02712145cd177.tar.bz2 | |
pc: Move ioapic_init() from pc_piix.c to pc.c
Move ioapic_init() from pc_piix.c to pc.c, to make it a common function.
Rename ioapic_init() -> ioapic_init_gsi().
Move to pc.h so q35 can use them as well.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/pc_piix.c')
| -rw-r--r-- | hw/pc_piix.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 910d417..e460799 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -95,29 +95,6 @@ static void kvm_piix3_gsi_handler(void *opaque, int n, int level) } } -static void ioapic_init(GSIState *gsi_state) -{ - DeviceState *dev; - SysBusDevice *d; - unsigned int i; - - if (kvm_irqchip_in_kernel()) { - dev = qdev_create(NULL, "kvm-ioapic"); - } else { - dev = qdev_create(NULL, "ioapic"); - } - /* FIXME: this should be under the piix3. */ - object_property_add_child(object_resolve_path("i440fx", NULL), - "ioapic", OBJECT(dev), NULL); - qdev_init_nofail(dev); - d = sysbus_from_qdev(dev); - sysbus_mmio_map(d, 0, 0xfec00000); - - for (i = 0; i < IOAPIC_NUM_PINS; i++) { - gsi_state->ioapic_irq[i] = qdev_get_gpio_in(dev, i); - } -} - /* PC hardware initialisation */ static void pc_init1(MemoryRegion *system_memory, MemoryRegion *system_io, @@ -221,7 +198,7 @@ static void pc_init1(MemoryRegion *system_memory, gsi_state->i8259_irq[i] = i8259[i]; } if (pci_enabled) { - ioapic_init(gsi_state); + ioapic_init_gsi(gsi_state, "i440fx"); } pc_register_ferr_irq(gsi[13]); |