From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:42502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWJW3-0006sz-5N for qemu-devel@nongnu.org; Mon, 13 Jun 2011 22:38:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QWJW0-0006gq-HM for qemu-devel@nongnu.org; Mon, 13 Jun 2011 22:38:06 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:57764) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWJVz-0006gb-NL for qemu-devel@nongnu.org; Mon, 13 Jun 2011 22:38:03 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 14 Jun 2011 04:37:41 +0200 Message-Id: <1308019077-61957-8-git-send-email-andreas.faerber@web.de> In-Reply-To: <1308019077-61957-7-git-send-email-andreas.faerber@web.de> References: <1308019077-61957-1-git-send-email-andreas.faerber@web.de> <1308019077-61957-2-git-send-email-andreas.faerber@web.de> <1308019077-61957-3-git-send-email-andreas.faerber@web.de> <1308019077-61957-4-git-send-email-andreas.faerber@web.de> <1308019077-61957-5-git-send-email-andreas.faerber@web.de> <1308019077-61957-6-git-send-email-andreas.faerber@web.de> <1308019077-61957-7-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: andreas.faerber@web.de Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [RFC 07/23] 40p: Add a PCI to ISA bridge (i82378) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Markus Armbruster Signed-off-by: Herv=C3=A9 Poussineau Don't create an ISA bus at machine level, the i82378 does that. Cc: Markus Armbruster Signed-off-by: Andreas F=C3=A4rber --- hw/ppc_prep.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 50cb6c7..27e1d14 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -775,8 +775,10 @@ static void ibm_40p_init(ram_addr_t ram_size, char *filename; int bios_size; ram_addr_t ram_offset, bios_offset; + qemu_irq *cpu_exit_irq; DeviceState *dev; PCIBus *pci_bus; + PCIDevice *pci; =20 // IBM E15 graphic adapter (S3 Vision864) // PowerPC 601 @@ -823,7 +825,12 @@ static void ibm_40p_init(ram_addr_t ram_size, /* PCI host */ dev =3D sysbus_create_simple("prep-pci", 0x80800000, NULL); pci_bus =3D (PCIBus *)qdev_get_child_bus(dev, "pci"); - (void)pci_bus; + + /* PCI -> ISA bridge */ + pci =3D pci_create_simple(pci_bus, PCI_DEVFN(1, 0), "i82378"); + cpu_exit_irq =3D qemu_allocate_irqs(cpu_request_exit, NULL, 1); + qdev_connect_gpio_out(&pci->qdev, 0, env->irq_inputs[PPC6xx_INPUT_IN= T]); + qdev_connect_gpio_out(&pci->qdev, 1, *cpu_exit_irq); } =20 static QEMUMachine prep_machine =3D { --=20 1.7.5.3