From a39e356458335418973ca7d388c02712145cd177 Mon Sep 17 00:00:00 2001 From: Jason Baron Date: Wed, 14 Nov 2012 15:54:01 -0500 Subject: 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 Signed-off-by: Jason Baron Signed-off-by: Anthony Liguori --- hw/pc_piix.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'hw/pc_piix.c') diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 910d417002..e460799b1b 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]); -- cgit v1.2.3