From patchwork Thu Aug 27 06:17:52 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 32221 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 398A7B70B3 for ; Thu, 27 Aug 2009 16:19:15 +1000 (EST) Received: from localhost ([127.0.0.1]:36010 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MgYKC-00008r-GJ for incoming@patchwork.ozlabs.org; Thu, 27 Aug 2009 02:19:08 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MgYJM-00006x-56 for qemu-devel@nongnu.org; Thu, 27 Aug 2009 02:18:16 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MgYJH-0008U3-4k for qemu-devel@nongnu.org; Thu, 27 Aug 2009 02:18:15 -0400 Received: from [199.232.76.173] (port=32851 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MgYJH-0008Tp-0G for qemu-devel@nongnu.org; Thu, 27 Aug 2009 02:18:11 -0400 Received: from moutng.kundenserver.de ([212.227.126.177]:59351) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MgYJG-00071h-At for qemu-devel@nongnu.org; Thu, 27 Aug 2009 02:18:10 -0400 Received: from flocke.weilnetz.de (p54ADF4D0.dip.t-dialin.net [84.173.244.208]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0MKv1o-1MgYIz2bZt-000HYe; Thu, 27 Aug 2009 08:17:54 +0200 Received: from stefan by flocke.weilnetz.de with local (Exim 4.69) (envelope-from ) id 1MgYIy-0004I3-OP; Thu, 27 Aug 2009 08:17:52 +0200 From: Stefan Weil To: Gerd Hoffmann , QEMU Developers Date: Thu, 27 Aug 2009 08:17:52 +0200 Message-Id: <1251353872-16463-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <4A961C81.1040500@mail.berlios.de> References: <4A961C81.1040500@mail.berlios.de> X-Provags-ID: V01U2FsdGVkX18Q0WSsUA/6WQDcvucgNf65XH2mWliFUJiIQTo WKtURjlvthtxYBvYwVe9Pha+oDmPpvCO5k/1ZKfbRDdv9A1vy5 uK0PgPyV1nJb0xa6qxCeoAB2u05nYgMCUIckMUp/OoYRURs+jv Fkw== X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH] mips malta: Fix fdc regression 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 8baf73adf664e79eae201c3f618078a220a661d9 (qdev/isa: convert fdc) breaks MIPS Malta: Tried to create isa device isa-fdc with no isa bus present Fix this by creating an isa bus for piix4 and convert initialization code for i8042 in mips_malta.c to new style (copy from pc.c) Signed-off-by: Stefan Weil --- hw/mips_malta.c | 6 +++++- hw/piix_pci.c | 1 + 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/hw/mips_malta.c b/hw/mips_malta.c index d8fa264..e4421a6 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -764,6 +764,7 @@ void mips_malta_init (ram_addr_t ram_size, target_long bios_size; int64_t kernel_entry; PCIBus *pci_bus; + ISADevice *isa_dev; CPUState *env; RTCState *rtc_state; fdctrl_t *floppy_controller; @@ -919,7 +920,10 @@ void mips_malta_init (ram_addr_t ram_size, DMA_init(0); /* Super I/O */ - i8042_init(i8259[1], i8259[12], 0x60); + isa_dev = isa_create_simple("i8042", 0x60, 0x64); + isa_connect_irq(isa_dev, 0, i8259[1]); + isa_connect_irq(isa_dev, 1, i8259[12]); + rtc_state = rtc_init(0x70, i8259[8], 2000); serial_init(0x3f8, i8259[4], 115200, serial_hds[0]); serial_init(0x2f8, i8259[3], 115200, serial_hds[1]); diff --git a/hw/piix_pci.c b/hw/piix_pci.c index e2ddf4b..736fca4 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -362,6 +362,7 @@ static void piix4_initfn(PCIDevice *d) { uint8_t *pci_conf; + isa_bus_new(&d->qdev); register_savevm("PIIX4", 0, 2, piix_save, piix_load, d); pci_conf = d->config;