From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N8XUj-0006Vk-3u for qemu-devel@nongnu.org; Thu, 12 Nov 2009 06:05:41 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N8XUe-0006PZ-7B for qemu-devel@nongnu.org; Thu, 12 Nov 2009 06:05:40 -0500 Received: from [199.232.76.173] (port=40721 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8XUe-0006PM-1i for qemu-devel@nongnu.org; Thu, 12 Nov 2009 06:05:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39740) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N8XUc-0007pI-4n for qemu-devel@nongnu.org; Thu, 12 Nov 2009 06:05:34 -0500 Date: Thu, 12 Nov 2009 13:02:59 +0200 From: "Michael S. Tsirkin" Message-ID: <20091112110259.GA4815@redhat.com> References: <1258005528-25383-1-git-send-email-yamahata@valinux.co.jp> <1258005528-25383-6-git-send-email-yamahata@valinux.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1258005528-25383-6-git-send-email-yamahata@valinux.co.jp> Subject: [Qemu-devel] Re: [PATCH 05/20] pci: rename pci_addr_to_dev(), pcie_mmcfg_addr_to_dev(). List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Isaku Yamahata Cc: qemu-devel@nongnu.org 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" suggested. > > Signed-off-by: Isaku Yamahata Acked-by: Michael S. Tsirkin > --- > 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