Patchwork [02/25] pci: add opaque argument to pci_map_irq_fn

login
register
mail settings
Submitter Alex Williamson
Date Sept. 14, 2012, 4:32 p.m.
Message ID <1347640366.486.1.camel@bling.home>
Download mbox | patch
Permalink /patch/183972/
State New
Headers show

Comments

Alex Williamson - Sept. 14, 2012, 4:32 p.m.
On Thu, 2012-09-13 at 16:12 -0400, Jason Baron wrote:
> From: Isaku Yamahata <yamahata@valinux.co.jp>
> 
> 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 <yamahata@valinux.co.jp>
> Signed-off-by: Jason Baron <jbaron@redhat.com>
> ---
>  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

Patch

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;