diff options
| author | Richard Henderson <rth@twiddle.net> | 2011-08-10 15:28:13 -0700 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-09-25 14:58:36 +0300 |
| commit | 4bae1efe63a507b99cad4f8c8b8cf6fa8d203881 (patch) | |
| tree | 21d5a4b1335ac2ad31e3ef46cac38babf6f564ff /hw/pc_piix.c | |
| parent | 78e20593527ce35c5be9d89d686ba9d8e95041b6 (diff) | |
| download | qemu-4bae1efe63a507b99cad4f8c8b8cf6fa8d203881.zip qemu-4bae1efe63a507b99cad4f8c8b8cf6fa8d203881.tar.gz qemu-4bae1efe63a507b99cad4f8c8b8cf6fa8d203881.tar.bz2 | |
pc: Re-order pc_init1 to initialize the ISA bus before ISA devices
In particular, the i8259 was being initialized before the ISA bus,
leading to a crash.
Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/pc_piix.c')
| -rw-r--r-- | hw/pc_piix.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 1056cc7..ce1c87f 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -130,17 +130,7 @@ static void pc_init1(MemoryRegion *system_memory, pci_enabled ? rom_memory : system_memory, &ram_memory); } - if (!xen_enabled()) { - cpu_irq = pc_allocate_cpu_irq(); - i8259 = i8259_init(cpu_irq[0]); - } else { - i8259 = xen_interrupt_controller_init(); - } isa_irq_state = g_malloc0(sizeof(*isa_irq_state)); - isa_irq_state->i8259 = i8259; - if (pci_enabled) { - ioapic_init(isa_irq_state); - } isa_irq = qemu_allocate_irqs(isa_irq_handler, isa_irq_state, 24); if (pci_enabled) { @@ -161,6 +151,18 @@ static void pc_init1(MemoryRegion *system_memory, } isa_bus_irqs(isa_irq); + if (!xen_enabled()) { + cpu_irq = pc_allocate_cpu_irq(); + i8259 = i8259_init(cpu_irq[0]); + } else { + i8259 = xen_interrupt_controller_init(); + } + + isa_irq_state->i8259 = i8259; + if (pci_enabled) { + ioapic_init(isa_irq_state); + } + pc_register_ferr_irq(isa_get_irq(13)); pc_vga_init(pci_enabled? pci_bus: NULL); |