From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38887) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCYp7-0006xK-Ie for qemu-devel@nongnu.org; Fri, 14 Sep 2012 12:33:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TCYp1-0006JY-3v for qemu-devel@nongnu.org; Fri, 14 Sep 2012 12:32:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:65244) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCYp0-0006JR-SF for qemu-devel@nongnu.org; Fri, 14 Sep 2012 12:32:51 -0400 Message-ID: <1347640366.486.1.camel@bling.home> From: Alex Williamson Date: Fri, 14 Sep 2012 10:32:46 -0600 In-Reply-To: <7b687f8d077efcbc125a58395a99292742564f9d.1347561356.git.jbaron@redhat.com> References: <7b687f8d077efcbc125a58395a99292742564f9d.1347561356.git.jbaron@redhat.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 02/25] pci: add opaque argument to pci_map_irq_fn List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jason Baron Cc: aliguori@us.ibm.com, mst@redhat.com, jan.kiszka@siemens.com, qemu-devel@nongnu.org, agraf@suse.de, yamahata@valinux.co.jp, juzhang@redhat.com, kevin@koconnor.net, avi@redhat.com, mkletzan@redhat.com, lcapitulino@redhat.com, afaerber@suse.de, armbru@redhat.com On Thu, 2012-09-13 at 16:12 -0400, Jason Baron wrote: > From: Isaku Yamahata > > Pass opaque argument to pci_map_irq_fn like pci_set_irq_fn. > ICH9 irq routing is not static, but configurable by chipset configuration > registers, so the corresponding irq mapping function of pci_map_irq_fn > needs to know the pointer to ich9. > > [jbaron@redhat.com: minor tweaks] > Signed-off-by: Isaku Yamahata > Signed-off-by: Jason Baron > --- > hw/apb_pci.c | 4 ++-- > hw/bonito.c | 2 +- > hw/dec_pci.c | 2 +- > hw/grackle_pci.c | 2 +- > hw/gt64xxx.c | 2 +- > hw/pci.c | 4 ++-- > hw/pci.h | 2 +- > hw/pci_bridge_dev.c | 2 +- > hw/piix_pci.c | 2 +- > hw/ppc4xx_pci.c | 2 +- > hw/ppce500_pci.c | 2 +- > hw/prep_pci.c | 2 +- > hw/sh_pci.c | 2 +- > hw/unin_pci.c | 2 +- > hw/versatile_pci.c | 2 +- > hw/xen.h | 2 +- > xen-all.c | 2 +- > xen-stub.c | 2 +- > 18 files changed, 20 insertions(+), 20 deletions(-) Missed alpha here diff --git a/hw/alpha_dp264.c b/hw/alpha_dp264.c index 9eb939f..71b0790 100644 --- a/hw/alpha_dp264.c +++ b/hw/alpha_dp264.c @@ -33,7 +33,7 @@ static uint64_t cpu_alpha_superpage_to_phys(void *opaque, uint (3) The interrupt number assigned by the kernel. The following function is concerned with (1) only. */ -static int clipper_pci_map_irq(PCIDevice *d, int irq_num) +static int clipper_pci_map_irq(void *opaque, PCIDevice *d, int irq_num) { int slot = d->devfn >> 3;