From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38974) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwV0D-0008So-BD for qemu-devel@nongnu.org; Thu, 25 Aug 2011 04:09:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QwV07-0004yI-Oq for qemu-devel@nongnu.org; Thu, 25 Aug 2011 04:09:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36151) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwV07-0004xB-5O for qemu-devel@nongnu.org; Thu, 25 Aug 2011 04:09:23 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p7P89MIH021866 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 25 Aug 2011 04:09:22 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p7P89Ltg020403 for ; Thu, 25 Aug 2011 04:09:22 -0400 From: Avi Kivity Date: Thu, 25 Aug 2011 11:09:11 +0300 Message-Id: <1314259758-5198-13-git-send-email-avi@redhat.com> In-Reply-To: <1314259758-5198-1-git-send-email-avi@redhat.com> References: <1314259758-5198-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH 12/19] pc: Re-order pc_init1 to initialize the ISA bus before ISA devices List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Richard Henderson In particular, the i8259 was being initialized before the ISA bus, leading to a crash. Signed-off-by: Richard Henderson Signed-off-by: Avi Kivity --- 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