From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Mh0L2-0007Bj-23
	for qemu-devel@nongnu.org; Fri, 28 Aug 2009 08:13:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Mh0Kx-00070H-CA
	for qemu-devel@nongnu.org; Fri, 28 Aug 2009 08:13:51 -0400
Received: from [199.232.76.173] (port=49970 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Mh0Kx-000707-9H
	for qemu-devel@nongnu.org; Fri, 28 Aug 2009 08:13:47 -0400
Received: from moutng.kundenserver.de ([212.227.126.188]:64419)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <weil@mail.berlios.de>) id 1Mh0Kw-0005kY-Pc
	for qemu-devel@nongnu.org; Fri, 28 Aug 2009 08:13:47 -0400
Received: from localhost ([127.0.0.1] ident=stefan)
	by flocke.weilnetz.de with esmtp (Exim 4.69)
	(envelope-from <weil@mail.berlios.de>) id 1Mh0Ku-0003NE-H4
	for qemu-devel@nongnu.org; Fri, 28 Aug 2009 14:13:44 +0200
Message-ID: <4A97C9F8.9040409@mail.berlios.de>
Date: Fri, 28 Aug 2009 14:13:44 +0200
From: Stefan Weil <weil@mail.berlios.de>
MIME-Version: 1.0
References: <4A97C3B4.8030006@mail.berlios.de>
	<1251460597-11518-1-git-send-email-weil@mail.berlios.de>
In-Reply-To: <1251460597-11518-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: Use qdev for i8042 setup
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: QEMU Developers <qemu-devel@nongnu.org>

Stefan Weil schrieb:
> This is just a copy of similar changes which were applied to pc.c.
>
> Signed-off-by: Stefan Weil <weil@mail.berlios.de>
> ---
>  hw/mips_malta.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/hw/mips_malta.c b/hw/mips_malta.c
> index a70d79e..23c257a 100644
> --- a/hw/mips_malta.c
> +++ b/hw/mips_malta.c
> @@ -765,6 +765,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;
> @@ -920,7 +921,8 @@ 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, 1, 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]);
>   

Please don't use this patch. It results in a runtime error because
isa interrupts are uninitialized.

Stefan