[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/19] pc: Re-order pc_init1 to initialize the ISA b
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 12/19] pc: Re-order pc_init1 to initialize the ISA bus before ISA devices |
Date: |
Thu, 25 Aug 2011 11:09:11 +0300 |
From: Richard Henderson <address@hidden>
In particular, the i8259 was being initialized before the ISA bus,
leading to a crash.
Signed-off-by: Richard Henderson <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
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 9a8f580..322f267 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -123,17 +123,7 @@ static void pc_init1(MemoryRegion *system_memory,
pci_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) {
@@ -153,6 +143,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);
--
1.7.5.3
- [Qemu-devel] [PATCH 00/19] Memory API conversions: batch 6, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 09/19] pci: add pci_address_space_io(), Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 01/19] mips_fulong2e: convert to memory API, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 04/19] mips_mipssim: convert to memory API, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 19/19] pci: simplify memory region registration, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 17/19] serial: Convert serial_isa_initfn to MemoryRegion, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 13/19] cs4231a: Convert to MemoryRegion, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 11/19] isa: add isa_register_ioport(), Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 12/19] pc: Re-order pc_init1 to initialize the ISA bus before ISA devices,
Avi Kivity <=
- [Qemu-devel] [PATCH 06/19] musicpal: convert to memory API, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 14/19] i8254: Convert to MemoryRegion, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 18/19] fdc: Convert isabus_fdc_init1 to MemoryRegion, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 07/19] omap1: convert to memory API (part I), Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 16/19] pckbd: Convert to MemoryRegion, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 10/19] isa: Pass i/o address space to isa_bus_new, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 15/19] i8259: Convert to MemoryRegion, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 05/19] mips_r4k: convert to memory API, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 03/19] mips_malta: convert to memory API, Avi Kivity, 2011/08/25
- [Qemu-devel] [PATCH 08/19] omap1: convert to memory API (part II), Avi Kivity, 2011/08/25