From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MOtH3-0002KI-JP for qemu-devel@nongnu.org; Thu, 09 Jul 2009 09:02:54 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MOtGx-0002ES-0C for qemu-devel@nongnu.org; Thu, 09 Jul 2009 09:02:52 -0400 Received: from [199.232.76.173] (port=42394 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MOtGw-0002Dv-Go for qemu-devel@nongnu.org; Thu, 09 Jul 2009 09:02:46 -0400 Received: from mx2.redhat.com ([66.187.237.31]:54510) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MOtGv-0002EP-QQ for qemu-devel@nongnu.org; Thu, 09 Jul 2009 09:02:46 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n69D2j6Y016285 for ; Thu, 9 Jul 2009 09:02:45 -0400 From: Gerd Hoffmann Date: Thu, 9 Jul 2009 15:02:40 +0200 Message-Id: <1247144560-9014-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1247144560-9014-1-git-send-email-kraxel@redhat.com> References: <1247144560-9014-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] qdev/isa: make pc use qdev for i8042 setup. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- hw/pc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index ecb618d..51e2768 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1095,6 +1095,7 @@ static void pc_init1(ram_addr_t ram_size, int bios_size, isa_bios_size, oprom_area_size; PCIBus *pci_bus; DeviceState *qdev; + ISADevice *isa_dev; int piix3_devfn = -1; CPUState *env; qemu_irq *cpu_irq; @@ -1344,7 +1345,9 @@ static void pc_init1(ram_addr_t ram_size, } } - 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]); DMA_init(0); #ifdef HAS_AUDIO audio_init(pci_enabled ? pci_bus : NULL, i8259); -- 1.6.2.5