From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ykf2c-0001Qx-4E for qemu-devel@nongnu.org; Tue, 21 Apr 2015 16:45:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ykf2Y-0007zG-U6 for qemu-devel@nongnu.org; Tue, 21 Apr 2015 16:45:10 -0400 Received: from e37.co.us.ibm.com ([32.97.110.158]:39906) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ykf2Y-0007uM-NT for qemu-devel@nongnu.org; Tue, 21 Apr 2015 16:45:06 -0400 Received: from /spool/local by e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 21 Apr 2015 14:45:04 -0600 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Roth In-Reply-To: <1428679484-15451-4-git-send-email-aik@ozlabs.ru> References: <1428679484-15451-1-git-send-email-aik@ozlabs.ru> <1428679484-15451-4-git-send-email-aik@ozlabs.ru> Message-ID: <20150421204455.14212.92493@loki> Date: Tue, 21 Apr 2015 15:44:55 -0500 Subject: Re: [Qemu-devel] [PATCH qemu v6 03/15] spapr_pci: Make find_phb()/find_dev() public List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexey Kardashevskiy , qemu-devel@nongnu.org Cc: Alexander Graf , Gavin Shan , Alex Williamson , qemu-ppc@nongnu.org, David Gibson 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 > Reviewed-by: David Gibson > --- > 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 =3D rtas_ld(args, 0); > option =3D rtas_ld(args, 3); > = > - sphb =3D find_phb(spapr, buid); > + sphb =3D 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 =3D ((uint64_t)rtas_ld(args, 1) << 32) | rtas_ld(args, 2); > - sphb =3D find_phb(spapr, buid); > + sphb =3D 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 =3D rtas_ld(args, 0); > - pdev =3D find_dev(spapr, buid, addr); > + pdev =3D 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(PowerPCCP= U *cpu, > } > = > buid =3D ((uint64_t)rtas_ld(args, 1) << 32) | rtas_ld(args, 2); > - sphb =3D find_phb(spapr, buid); > + sphb =3D 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 =3D ((uint64_t)rtas_ld(args, 1) << 32) | rtas_ld(args, 2); > option =3D rtas_ld(args, 3); > - sphb =3D find_phb(spapr, buid); > + sphb =3D 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 =3D ((uint64_t)rtas_ld(args, 1) << 32) | rtas_ld(args, 2); > - sphb =3D find_phb(spapr, buid); > + sphb =3D spapr_pci_find_phb(spapr, buid); > if (!sphb) { > goto param_error_exit; > } > @@ -631,7 +631,7 @@ static void rtas_ibm_slot_error_detail(PowerPCCPU *cp= u, > } > = > buid =3D ((uint64_t)rtas_ld(args, 1) << 32) | rtas_ld(args, 2); > - sphb =3D find_phb(spapr, buid); > + sphb =3D spapr_pci_find_phb(spapr, buid); > if (!sphb) { > goto param_error_exit; > } > -- = > 2.0.0