From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N8XTJ-0004hg-Li
	for qemu-devel@nongnu.org; Thu, 12 Nov 2009 06:04:13 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N8XTF-0004dG-Vm
	for qemu-devel@nongnu.org; Thu, 12 Nov 2009 06:04:13 -0500
Received: from [199.232.76.173] (port=60812 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N8XTF-0004d8-Nf
	for qemu-devel@nongnu.org; Thu, 12 Nov 2009 06:04:09 -0500
Received: from mx1.redhat.com ([209.132.183.28]:36940)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <mst@redhat.com>) id 1N8XTF-0007d8-49
	for qemu-devel@nongnu.org; Thu, 12 Nov 2009 06:04:09 -0500
Date: Thu, 12 Nov 2009 13:01:36 +0200
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20091112110136.GB4769@redhat.com>
References: <1258005528-25383-1-git-send-email-yamahata@valinux.co.jp>
	<1258005528-25383-5-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-5-git-send-email-yamahata@valinux.co.jp>
Subject: [Qemu-devel] Re: [PATCH 04/20] pci: remove pci_addr_to_config() by
	open code
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Isaku Yamahata <yamahata@valinux.co.jp>
Cc: qemu-devel@nongnu.org

On Thu, Nov 12, 2009 at 02:58:32PM +0900, Isaku Yamahata wrote:
> This patch removes pci_addr_to_config() and open code it
> as suggested by Michael S. Tsirkin <mst@redhat.com>.
> 
> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

Acked-by: Michael S. Tsirkin <mst@redhat.com>

> ---
>  hw/pci_host.c |    9 ++-------
>  1 files changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/hw/pci_host.c b/hw/pci_host.c
> index 4196ebc..93c94e8 100644
> --- a/hw/pci_host.c
> +++ b/hw/pci_host.c
> @@ -47,15 +47,10 @@ static inline PCIDevice *pci_addr_to_dev(PCIBus *bus, uint32_t addr)
>      return pci_find_device(bus, bus_num, PCI_SLOT(devfn), PCI_FUNC(devfn));
>  }
>  
> -static inline uint32_t pci_addr_to_config(uint32_t addr)
> -{
> -    return addr & (PCI_CONFIG_SPACE_SIZE - 1);
> -}
> -
>  void pci_data_write(PCIBus *s, uint32_t addr, uint32_t val, int len)
>  {
>      PCIDevice *pci_dev = pci_addr_to_dev(s, addr);
> -    uint32_t config_addr = pci_addr_to_config(addr);
> +    uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE - 1);
>  
>      if (!pci_dev)
>          return;
> @@ -68,7 +63,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);
> -    uint32_t config_addr = pci_addr_to_config(addr);
> +    uint32_t config_addr = addr & (PCI_CONFIG_SPACE_SIZE - 1);
>      uint32_t val;
>  
>      assert(len == 1 || len == 2 || len == 4);
> -- 
> 1.6.0.2