Received: from eggs.gnu.org ([140.186.70.92]:42999) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8qII-0004fg-GR for qemu-devel@nongnu.org; Wed, 28 Sep 2011 05:19:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R8qIC-0000nJ-Lf for qemu-devel@nongnu.org; Wed, 28 Sep 2011 05:19:10 -0400 Received: from david.siemens.de ([192.35.17.14]:23714) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8qIC-0000nB-Bl for qemu-devel@nongnu.org; Wed, 28 Sep 2011 05:19:04 -0400 Message-ID: <4E82E686.4040604@siemens.com> Date: Wed, 28 Sep 2011 11:19:02 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] mips_fulong2e: Reorder ISA bus and i8259 creation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity Cc: qemu-devel Missed during memory region conversion: The i8259 now depends on the ISA bus being created first. Reorder the initialization. Signed-off-by: Jan Kiszka --- I had a reordering patch in my i8259-qdev queue as well, and these bits were left over after rebasing over current master. hw/mips_fulong2e.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/mips_fulong2e.c b/hw/mips_fulong2e.c index f52b8c5..04921c1 100644 --- a/hw/mips_fulong2e.c +++ b/hw/mips_fulong2e.c @@ -331,10 +331,6 @@ static void mips_fulong2e_init(ram_addr_t ram_size, const char *boot_device, cpu_mips_irq_init_cpu(env); cpu_mips_clock_init(env); - /* Interrupt controller */ - /* The 8259 -> IP5 */ - i8259 = i8259_init(env->irq[5]); - /* North bridge, Bonito --> IP2 */ pci_bus = bonito_init((qemu_irq *)&(env->irq[2])); @@ -347,7 +343,11 @@ static void mips_fulong2e_init(ram_addr_t ram_size, const char *boot_device, exit(1); } + /* Interrupt controller */ + /* The 8259 -> IP5 */ + i8259 = i8259_init(env->irq[5]); isa_bus_irqs(i8259); + vt82c686b_ide_init(pci_bus, hd, PCI_DEVFN(FULONG2E_VIA_SLOT, 1)); usb_uhci_vt82c686b_init(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 2)); usb_uhci_vt82c686b_init(pci_bus, PCI_DEVFN(FULONG2E_VIA_SLOT, 3)); -- 1.7.3.4