From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MnDoE-0004ew-7n for qemu-devel@nongnu.org; Mon, 14 Sep 2009 11:49:42 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MnDo8-0004ZT-54 for qemu-devel@nongnu.org; Mon, 14 Sep 2009 11:49:40 -0400 Received: from [199.232.76.173] (port=54817 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MnDo7-0004Yv-Af for qemu-devel@nongnu.org; Mon, 14 Sep 2009 11:49:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33009) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MnDo6-0007Va-Qm for qemu-devel@nongnu.org; Mon, 14 Sep 2009 11:49:35 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8EFnYaU003168 for ; Mon, 14 Sep 2009 11:49:34 -0400 From: Gerd Hoffmann Date: Mon, 14 Sep 2009 17:49:24 +0200 Message-Id: <1252943364-32705-10-git-send-email-kraxel@redhat.com> In-Reply-To: <1252943364-32705-1-git-send-email-kraxel@redhat.com> References: <1252943364-32705-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 9/9] unbreak ppc/prep List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Changes: * added isa bus, hooked up to the system bus. Not sure this is correct, but 'info pci' lists lists no pci-isa bridge in the machine ...). * switches the default cpu to one which actually works. Signed-off-by: Gerd Hoffmann --- hw/ppc_prep.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 6001c86..5392072 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -572,7 +572,7 @@ static void ppc_prep_init (ram_addr_t ram_size, /* init CPUs */ if (cpu_model == NULL) - cpu_model = "default"; + cpu_model = "602"; for (i = 0; i < smp_cpus; i++) { env = cpu_init(cpu_model); if (!env) { @@ -670,6 +670,9 @@ static void ppc_prep_init (ram_addr_t ram_size, } i8259 = i8259_init(first_cpu->irq_inputs[PPC6xx_INPUT_INT]); pci_bus = pci_prep_init(i8259); + /* Hmm, prep has no pci-isa bridge ??? */ + isa_bus_new(NULL); + isa_bus_irqs(i8259); // pci_bus = i440fx_init(); /* Register 8 MB of ISA IO space (needed for non-contiguous map) */ PPC_io_memory = cpu_register_io_memory(PPC_prep_io_read, -- 1.6.2.5