From patchwork Fri Nov 13 04:29:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 38317 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 15556B7BC1 for ; Fri, 13 Nov 2009 15:41:11 +1100 (EST) Received: from localhost ([127.0.0.1]:48936 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8ny8-0002IQ-8Y for incoming@patchwork.ozlabs.org; Thu, 12 Nov 2009 23:41:08 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N8ntP-0000IJ-8b for qemu-devel@nongnu.org; Thu, 12 Nov 2009 23:36:15 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N8ntK-0000Di-69 for qemu-devel@nongnu.org; Thu, 12 Nov 2009 23:36:14 -0500 Received: from [199.232.76.173] (port=50445 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8ntJ-0000DY-OP for qemu-devel@nongnu.org; Thu, 12 Nov 2009 23:36:09 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:35513) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N8ntJ-0002dP-0m for qemu-devel@nongnu.org; Thu, 12 Nov 2009 23:36:09 -0500 Received: from nm.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with ESMTP id 1E2274A413; Fri, 13 Nov 2009 13:36:02 +0900 (JST) Received: from yamahata by nm.local.valinux.co.jp with local (Exim 4.69) (envelope-from ) id 1N8nnI-0000wN-Nf; Fri, 13 Nov 2009 13:29:56 +0900 From: Isaku Yamahata To: qemu-devel@nongnu.org, mst@redhat.com Date: Fri, 13 Nov 2009 13:29:41 +0900 Message-Id: <1258086596-3584-6-git-send-email-yamahata@valinux.co.jp> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1258086596-3584-1-git-send-email-yamahata@valinux.co.jp> References: <1258086596-3584-1-git-send-email-yamahata@valinux.co.jp> X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: yamahata@valinux.co.jp Subject: [Qemu-devel] [PATCH V2 05/20] pci: rename pci_addr_to_dev(), pcie_mmcfg_addr_to_dev(). X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 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) {