[Qemu-devel] Re: [PATCH 05/20] pci: rename pci_addr_to_dev(), pcie_mmcfg_addr_to_dev().

[Michael S. Tsirkin]

On Thu, Nov 12, 2009 at 02:58:33PM +0900, Isaku Yamahata wrote:
> This patch renames pci_addr_to_dev(), pcie_mmcfg_addr_to_dev()
> to pci_dev_find_by_addr(), pcie_dev_find_by_mmcfg_addr()
> as "Michael S. Tsirkin" <address@hidden> suggested.
> 
> Signed-off-by: Isaku Yamahata <address@hidden>

Acked-by: Michael S. Tsirkin <address@hidden>

> ---
>  hw/pci_host.c  |    6 +++---
>  hw/pcie_host.c |    7 ++++---
>  2 files changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/hw/pci_host.c b/hw/pci_host.c
> index 93c94e8..adecd7e 100644
> --- a/hw/pci_host.c
> +++ b/hw/pci_host.c
> @@ -40,7 +40,7 @@ do { printf("pci_host_data: " fmt , ## __VA_ARGS__); } 
> while (0)
>   */
>  
>  /* the helper functio to get a PCIDeice* for a given pci address */
> -static inline PCIDevice *pci_addr_to_dev(PCIBus *bus, uint32_t addr)
> +static inline PCIDevice *pci_dev_find_by_addr(PCIBus *bus, uint32_t addr)
>  {
>      uint8_t bus_num = (addr >> 16) & 0xff;
>      uint8_t devfn = (addr >> 8) & 0xff;
> @@ -49,7 +49,7 @@ static inline PCIDevice *pci_addr_to_dev(PCIBus *bus, 
> uint32_t addr)
>  
>  void pci_data_write(PCIBus *s, uint32_t addr, uint32_t val, int len)
>  {
> -    PCIDevice *pci_dev = pci_addr_to_dev(s, addr);
> +    PCIDevice *pci_dev = pci_dev_find_by_addr(s, addr);
>      uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE - 1);
>  
>      if (!pci_dev)
> @@ -62,7 +62,7 @@ void pci_data_write(PCIBus *s, uint32_t addr, uint32_t val, 
> int len)
>  
>  uint32_t pci_data_read(PCIBus *s, uint32_t addr, int len)
>  {
> -    PCIDevice *pci_dev = pci_addr_to_dev(s, addr);
> +    PCIDevice *pci_dev = pci_dev_find_by_addr(s, addr);
>      uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE - 1);
>      uint32_t val;
>  
> diff --git a/hw/pcie_host.c b/hw/pcie_host.c
> index 61285da..08c3527 100644
> --- a/hw/pcie_host.c
> +++ b/hw/pcie_host.c
> @@ -46,7 +46,8 @@
>  
>  
>  /* a helper function to get a PCIDevice for a given mmconfig address */
> -static inline PCIDevice *pcie_mmcfg_addr_to_dev(PCIBus *s, uint32_t 
> mmcfg_addr)
> +static inline PCIDevice *pcie_dev_find_by_mmcfg_addr(PCIBus *s,
> +                                                     uint32_t mmcfg_addr)
>  {
>      return pci_find_device(s, PCIE_MMCFG_BUS(mmcfg_addr),
>                             PCI_SLOT(PCIE_MMCFG_DEVFN(mmcfg_addr)),
> @@ -56,7 +57,7 @@ static inline PCIDevice *pcie_mmcfg_addr_to_dev(PCIBus *s, 
> uint32_t mmcfg_addr)
>  static void pcie_mmcfg_data_write(PCIBus *s,
>                                    uint32_t mmcfg_addr, uint32_t val, int len)
>  {
> -    PCIDevice *pci_dev = pcie_mmcfg_addr_to_dev(s, mmcfg_addr);
> +    PCIDevice *pci_dev = pcie_dev_find_by_mmcfg_addr(s, mmcfg_addr);
>  
>      if (!pci_dev)
>          return;
> @@ -68,7 +69,7 @@ static void pcie_mmcfg_data_write(PCIBus *s,
>  static uint32_t pcie_mmcfg_data_read(PCIBus *s,
>                                       uint32_t mmcfg_addr, int len)
>  {
> -    PCIDevice *pci_dev = pcie_mmcfg_addr_to_dev(s, mmcfg_addr);
> +    PCIDevice *pci_dev = pcie_dev_find_by_mmcfg_addr(s, mmcfg_addr);
>      uint32_t val;
>  
>      assert(len == 1 || len == 2 || len == 4);
> -- 
> 1.6.0.2