From patchwork Thu Aug 27 11:51:37 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 32244 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 A73F7B7BF9 for ; Thu, 27 Aug 2009 21:53:40 +1000 (EST) Received: from localhost ([127.0.0.1]:59465 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MgdXs-00036s-3n for incoming@patchwork.ozlabs.org; Thu, 27 Aug 2009 07:53:36 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MgdWA-00035I-PF for qemu-devel@nongnu.org; Thu, 27 Aug 2009 07:51:50 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MgdW6-00033i-RR for qemu-devel@nongnu.org; Thu, 27 Aug 2009 07:51:50 -0400 Received: from [199.232.76.173] (port=55991 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MgdW6-00033Y-HN for qemu-devel@nongnu.org; Thu, 27 Aug 2009 07:51:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33776) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MgdW5-0000HL-Iq for qemu-devel@nongnu.org; Thu, 27 Aug 2009 07:51:46 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7RBpglu021181; Thu, 27 Aug 2009 07:51:42 -0400 Received: from zweiblum.home.kraxel.org (vpn2-8-242.ams2.redhat.com [10.36.8.242]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7RBpdn3030420; Thu, 27 Aug 2009 07:51:40 -0400 Message-ID: <4A967349.1040808@redhat.com> Date: Thu, 27 Aug 2009 13:51:37 +0200 From: Gerd Hoffmann User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.1) Gecko/20090814 Fedora/3.0-2.6.b3.fc11 Lightning/1.0pre Thunderbird/3.0b3 MIME-Version: 1.0 To: Blue Swirl Subject: Re: [Qemu-devel] [PATCH 3/3] Move isa_connect_irq calls into isa_create_simple References: <1251293757-6007-1-git-send-email-kraxel@redhat.com> <1251293757-6007-4-git-send-email-kraxel@redhat.com> In-Reply-To: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: qemu-devel@nongnu.org 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 On 08/26/09 19:19, Blue Swirl wrote: > On Wed, Aug 26, 2009 at 4:35 PM, Gerd Hoffmann wrote: >> Now with isa-bus maintaining the isa irqs we can move the >> isa_connect_irq() calls into isa_create_simple(). > >> + if (-1 != irq) >> + if (-1 != irq2) > > Not again. Oh well. Probably needs some time to teach my fingers to stop doing that ... Fixed patch attached. cheers, Gerd From cb189da691cd3bf62a846c1e94e74b28ee9f3f40 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 14 Aug 2009 10:50:49 +0200 Subject: [PATCH] Move isa_connect_irq calls into isa_create_simple Now with isa-bus maintaining the isa irqs we can move the isa_connect_irq() calls into isa_create_simple(). --- hw/fdc.c | 3 +-- hw/isa-bus.c | 7 ++++++- hw/isa.h | 3 ++- hw/pc.c | 4 +--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index 0ece6db..e5a650a 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1878,9 +1878,8 @@ fdctrl_t *fdctrl_init_isa(int isairq, int dma_chann, fdctrl_t *fdctrl; ISADevice *dev; - dev = isa_create_simple("isa-fdc", io_base, 0); + dev = isa_create_simple("isa-fdc", io_base, 0, isairq, -1); fdctrl = &(DO_UPCAST(fdctrl_isabus_t, busdev, dev)->state); - isa_connect_irq(dev, 0, isairq); fdctrl->dma_chann = dma_chann; DMA_register_channel(dma_chann, &fdctrl_transfer_handler, fdctrl); diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 4ac4fad..1b12676 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -121,7 +121,8 @@ void isa_qdev_register(ISADeviceInfo *info) qdev_register(&info->qdev); } -ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2) +ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2, + uint32_t irq, uint32 irq2) { DeviceState *dev; ISADevice *isa; @@ -135,6 +136,10 @@ ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2 isa->iobase[0] = iobase; isa->iobase[1] = iobase2; qdev_init(dev); + if (irq != -1) + isa_connect_irq(isa, 0, irq); + if (irq2 != -1) + isa_connect_irq(isa, 1, irq2); return isa; } diff --git a/hw/isa.h b/hw/isa.h index 31853a0..872e3ef 100644 --- a/hw/isa.h +++ b/hw/isa.h @@ -30,7 +30,8 @@ void isa_connect_irq(ISADevice *dev, int devirq, int isairq); qemu_irq isa_reserve_irq(int isairq); void isa_init_irq(ISADevice *dev, qemu_irq *p); void isa_qdev_register(ISADeviceInfo *info); -ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2); +ISADevice *isa_create_simple(const char *name, uint32_t iobase, uint32_t iobase2, + uint32_t irq, uint32_t irq2); extern target_phys_addr_t isa_mem_base; diff --git a/hw/pc.c b/hw/pc.c index fc6a925..ab7ce20 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1375,9 +1375,7 @@ static void pc_init1(ram_addr_t ram_size, } } - isa_dev = isa_create_simple("i8042", 0x60, 0x64); - isa_connect_irq(isa_dev, 0, 1); - isa_connect_irq(isa_dev, 1, 12); + isa_dev = isa_create_simple("i8042", 0x60, 0x64, 1, 12); DMA_init(0); #ifdef HAS_AUDIO audio_init(pci_enabled ? pci_bus : NULL, isa_irq);