[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V2 05/20] pci: rename pci_addr_to_dev(), pcie_mmcfg_
From: |
Isaku Yamahata |
Subject: |
[Qemu-devel] [PATCH V2 05/20] pci: rename pci_addr_to_dev(), pcie_mmcfg_addr_to_dev(). |
Date: |
Fri, 13 Nov 2009 13:29:41 +0900 |
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 ccefa34..403d040 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 1dbc94e..fbd6c37 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;
@@ -67,7 +68,7 @@ static void pcie_mmcfg_data_write(PCIBus *s,
static uint32_t pcie_mmcfg_data_read(PCIBus *s, uint32_t addr, int len)
{
- PCIDevice *pci_dev = pcie_mmcfg_addr_to_dev(s, addr);
+ PCIDevice *pci_dev = pcie_dev_find_by_mmcfg_addr(s, addr);
assert(len == 1 || len == 2 || len == 4);
if (!pci_dev) {
--
1.6.0.2
- [Qemu-devel] [PATCH V2 00/20] PCI express clean up patches., Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 01/20] pci: fix pci_info_device()., Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 02/20] pci: move pci_data_{read, write}() declaration from pci.h to pci_host.h, Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 11/20] pci: clean up of pci_init_wmask()., Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 05/20] pci: rename pci_addr_to_dev(), pcie_mmcfg_addr_to_dev().,
Isaku Yamahata <=
- [Qemu-devel] [PATCH V2 03/20] pci: simplify (pci_/pcie_mmcfg_)data_read(), Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 07/20] pci: remove pci_sub_bus() by open coding., Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 09/20] pci_host: remove unnecessary & 0xff., Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 13/20] pci: move typedef, PCIHostState, PCIExpressHost to qemu-common.h., Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 17/20] pci: remove magic number, 256 in pci.c, Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 14/20] pci: remove unused constants., Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 19/20] pci: pci bridge related clean up., Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 06/20] pci: shorten pci_host_{conf, data}_register_xxx function a bit., Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 12/20] pci: remove some unnecessary comment in pci.h, Isaku Yamahata, 2009/11/12
- [Qemu-devel] [PATCH V2 15/20] pci: clean up of pci_update_mappings(), Isaku Yamahata, 2009/11/12