Re: [Qemu-devel] [PATCH qemu v6 03/15] spapr_pci: Make find_phb()/find_dev() public

[Michael Roth]

Quoting Alexey Kardashevskiy (2015-04-10 10:24:32)
> This makes find_phb()/find_dev() public and changed its names
> to spapr_pci_find_phb()/spapr_pci_find_dev() as they are going to
> be used from other parts of QEMU such as VFIO DDW (dynamic DMA window)
> or VFIO PCI error injection or VFIO EEH handling - in all these
> cases there are RTAS calls which are addressed to BUID+config_addr
> in IEEE1275 format.

ee954280da8d9ea7afd28b4c288da15fb8b4efca introduced more find_dev/find_phb
callers that didn't seem to get covered by the conversions here.

Noticed this was staged in spapr-next already, so may want to squash those
in.

> 
> Signed-off-by: Alexey Kardashevskiy <address@hidden>
> Reviewed-by: David Gibson <address@hidden>
> ---
>  hw/ppc/spapr_pci.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
> index 609a8ae..52c5c73 100644
> --- a/hw/ppc/spapr_pci.c
> +++ b/hw/ppc/spapr_pci.c
> @@ -426,7 +426,7 @@ static void rtas_ibm_set_eeh_option(PowerPCCPU *cpu,
>      addr = rtas_ld(args, 0);
>      option = rtas_ld(args, 3);
> 
> -    sphb = find_phb(spapr, buid);
> +    sphb = spapr_pci_find_phb(spapr, buid);
>      if (!sphb) {
>          goto param_error_exit;
>      }
> @@ -461,7 +461,7 @@ static void rtas_ibm_get_config_addr_info2(PowerPCCPU 
> *cpu,
>      }
> 
>      buid = ((uint64_t)rtas_ld(args, 1) << 32) | rtas_ld(args, 2);
> -    sphb = find_phb(spapr, buid);
> +    sphb = spapr_pci_find_phb(spapr, buid);
>      if (!sphb) {
>          goto param_error_exit;
>      }
> @@ -479,7 +479,7 @@ static void rtas_ibm_get_config_addr_info2(PowerPCCPU 
> *cpu,
>      switch (option) {
>      case RTAS_GET_PE_ADDR:
>          addr = rtas_ld(args, 0);
> -        pdev = find_dev(spapr, buid, addr);
> +        pdev = spapr_pci_find_dev(spapr, buid, addr);
>          if (!pdev) {
>              goto param_error_exit;
>          }
> @@ -516,7 +516,7 @@ static void rtas_ibm_read_slot_reset_state2(PowerPCCPU 
> *cpu,
>      }
> 
>      buid = ((uint64_t)rtas_ld(args, 1) << 32) | rtas_ld(args, 2);
> -    sphb = find_phb(spapr, buid);
> +    sphb = spapr_pci_find_phb(spapr, buid);
>      if (!sphb) {
>          goto param_error_exit;
>      }
> @@ -562,7 +562,7 @@ static void rtas_ibm_set_slot_reset(PowerPCCPU *cpu,
> 
>      buid = ((uint64_t)rtas_ld(args, 1) << 32) | rtas_ld(args, 2);
>      option = rtas_ld(args, 3);
> -    sphb = find_phb(spapr, buid);
> +    sphb = spapr_pci_find_phb(spapr, buid);
>      if (!sphb) {
>          goto param_error_exit;
>      }
> @@ -596,7 +596,7 @@ static void rtas_ibm_configure_pe(PowerPCCPU *cpu,
>      }
> 
>      buid = ((uint64_t)rtas_ld(args, 1) << 32) | rtas_ld(args, 2);
> -    sphb = find_phb(spapr, buid);
> +    sphb = spapr_pci_find_phb(spapr, buid);
>      if (!sphb) {
>          goto param_error_exit;
>      }
> @@ -631,7 +631,7 @@ static void rtas_ibm_slot_error_detail(PowerPCCPU *cpu,
>      }
> 
>      buid = ((uint64_t)rtas_ld(args, 1) << 32) | rtas_ld(args, 2);
> -    sphb = find_phb(spapr, buid);
> +    sphb = spapr_pci_find_phb(spapr, buid);
>      if (!sphb) {
>          goto param_error_exit;
>      }
> -- 
> 2.0.0