[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/28] mips_malta: move i8259 initialization after pi
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PULL 14/28] mips_malta: move i8259 initialization after piix4 initialization |
Date: |
Mon, 12 Sep 2011 13:50:52 +0300 |
i8259 is an ISA device; and the ISA bus is supplied by piix4. Later patches
make this dependency explicit.
Signed-off-by: Avi Kivity <address@hidden>
---
hw/mips_malta.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 0110daa..172f74e 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -928,10 +928,6 @@ void mips_malta_init (ram_addr_t ram_size,
cpu_mips_irq_init_cpu(env);
cpu_mips_clock_init(env);
- /* Interrupt controller */
- /* The 8259 is attached to the MIPS CPU INT0 pin, ie interrupt 2 */
- i8259 = i8259_init(env->irq[2]);
-
/* Northbridge */
pci_bus = gt64120_register(i8259);
@@ -939,6 +935,11 @@ void mips_malta_init (ram_addr_t ram_size,
ide_drive_get(hd, MAX_IDE_BUS);
piix4_devfn = piix4_init(pci_bus, 80);
+
+ /* Interrupt controller */
+ /* The 8259 is attached to the MIPS CPU INT0 pin, ie interrupt 2 */
+ i8259 = i8259_init(env->irq[2]);
+
isa_bus_irqs(i8259);
pci_piix4_ide_init(pci_bus, hd, piix4_devfn + 1);
usb_uhci_piix4_init(pci_bus, piix4_devfn + 2);
--
1.7.6.1
- Re: [Qemu-devel] [PULL 15/28] i8259: Convert to MemoryRegion, (continued)
- [Qemu-devel] [PULL 18/28] fdc: Convert isabus_fdc_init1 to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 08/28] pci: add pci_address_space_io(), Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 22/28] etrax-timer: Convert to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 10/28] isa: add isa_register_ioport(), Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 13/28] i8254: Convert to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 23/28] etrax-dma: Convert to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 21/28] etrax-ser: Convert to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 01/28] mips_jazz: convert to memory API, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 26/28] serial: Use enum device_endian in serial_mm_init parameter, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 14/28] mips_malta: move i8259 initialization after piix4 initialization,
Avi Kivity <=
- [Qemu-devel] [PULL 11/28] pc: Re-order pc_init1 to initialize the ISA bus before ISA devices, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 07/28] omap1: convert to memory API (part II), Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 19/28] pci: simplify memory region registration, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 16/28] pckbd: Convert to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 09/28] isa: Pass i/o address space to isa_bus_new, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 27/28] serial: Remove ioregister parameter from serial_mm_init, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 12/28] cs4231a: Convert to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 05/28] musicpal: convert to memory API, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 20/28] etrax-pic: Convert to MemoryRegion, Avi Kivity, 2011/09/12
- [Qemu-devel] [PULL 28/28] serial: Add MemoryRegion parameter to serial_mm_init, Avi Kivity, 2011/09/12