From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MgzvA-0003Hr-Vh for qemu-devel@nongnu.org; Fri, 28 Aug 2009 07:47:09 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mgzv6-0003Bo-2O for qemu-devel@nongnu.org; Fri, 28 Aug 2009 07:47:08 -0400 Received: from [199.232.76.173] (port=47757 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mgzv5-0003BW-PI for qemu-devel@nongnu.org; Fri, 28 Aug 2009 07:47:03 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:58440) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mgzv5-0008Ss-6M for qemu-devel@nongnu.org; Fri, 28 Aug 2009 07:47:03 -0400 Received: from localhost ([127.0.0.1] ident=stefan) by flocke.weilnetz.de with esmtp (Exim 4.69) (envelope-from ) id 1Mgzv2-0002wP-Fu for qemu-devel@nongnu.org; Fri, 28 Aug 2009 13:47:00 +0200 Message-ID: <4A97C3B4.8030006@mail.berlios.de> Date: Fri, 28 Aug 2009 13:47:00 +0200 From: Stefan Weil MIME-Version: 1.0 References: <4A961C81.1040500@mail.berlios.de> <1251353872-16463-1-git-send-email-weil@mail.berlios.de> In-Reply-To: <1251353872-16463-1-git-send-email-weil@mail.berlios.de> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [PATCH] mips malta: Fix fdc regression List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers Stefan Weil schrieb: > 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; > The patch no longer applies because i8042_init changed in latest QEMU. I'll split it in two independent new patches. Regards Stefan