From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47699) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R7oAu-0001Dr-BQ for qemu-devel@nongnu.org; Sun, 25 Sep 2011 08:51:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R7oAq-0007Fm-IC for qemu-devel@nongnu.org; Sun, 25 Sep 2011 08:51:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48360) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R7oAq-0007FD-5U for qemu-devel@nongnu.org; Sun, 25 Sep 2011 08:51:12 -0400 From: Avi Kivity Date: Sun, 25 Sep 2011 15:50:45 +0300 Message-Id: <1316955049-21516-11-git-send-email-avi@redhat.com> In-Reply-To: <1316955049-21516-1-git-send-email-avi@redhat.com> References: <1316955049-21516-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH 10/14] ppc_prep: initialize i8259 after the ISA bus List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori , qemu-devel@nongnu.org Succeeding i8259 conversion to ISA requires this. Signed-off-by: Avi Kivity --- hw/ppc_prep.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index f9325bd..d26049b 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -648,10 +648,10 @@ static void ppc_prep_init (ram_addr_t ram_size, if (PPC_INPUT(env) != PPC_FLAGS_INPUT_6xx) { hw_error("Only 6xx bus is supported on PREP machine\n"); } - i8259 = i8259_init(first_cpu->irq_inputs[PPC6xx_INPUT_INT]); - pci_bus = pci_prep_init(i8259, get_system_memory(), get_system_io()); /* Hmm, prep has no pci-isa bridge ??? */ isa_bus_new(NULL, get_system_io()); + i8259 = i8259_init(first_cpu->irq_inputs[PPC6xx_INPUT_INT]); + pci_bus = pci_prep_init(i8259, get_system_memory(), get_system_io()); isa_bus_irqs(i8259); // pci_bus = i440fx_init(); /* Register 8 MB of ISA IO space (needed for non-contiguous map) */ -- 1.7.6.3