From patchwork Fri Sep 11 12:32:31 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 33463 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id B6EA8B7043 for ; Fri, 11 Sep 2009 23:25:31 +1000 (EST) Received: from localhost ([127.0.0.1]:57933 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mm680-0007Sa-2m for incoming@patchwork.ozlabs.org; Fri, 11 Sep 2009 09:25:28 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mm5JS-0004SP-Mw for qemu-devel@nongnu.org; Fri, 11 Sep 2009 08:33:14 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mm5JM-0004Jp-Km for qemu-devel@nongnu.org; Fri, 11 Sep 2009 08:33:12 -0400 Received: from [199.232.76.173] (port=49296 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mm5JL-0004JO-TJ for qemu-devel@nongnu.org; Fri, 11 Sep 2009 08:33:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25545) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mm5JL-00047S-Ee for qemu-devel@nongnu.org; Fri, 11 Sep 2009 08:33:07 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8BCX6D5019886 for ; Fri, 11 Sep 2009 08:33:06 -0400 Received: from zweiblum.home.kraxel.org (vpn1-5-42.ams2.redhat.com [10.36.5.42]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id n8BCWwZr024023; Fri, 11 Sep 2009 08:33:01 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 7EC26700E7; Fri, 11 Sep 2009 14:32:32 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 11 Sep 2009 14:32:31 +0200 Message-Id: <1252672351-12937-9-git-send-email-kraxel@redhat.com> In-Reply-To: <1252672351-12937-1-git-send-email-kraxel@redhat.com> References: <1252672351-12937-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 8/8] unbreak ppc/prep X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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,