From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1N5KGb-00050O-RA
	for qemu-devel@nongnu.org; Tue, 03 Nov 2009 09:21:50 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1N5KGX-0004qY-1x
	for qemu-devel@nongnu.org; Tue, 03 Nov 2009 09:21:48 -0500
Received: from [199.232.76.173] (port=44074 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1N5KGV-0004qQ-AH
	for qemu-devel@nongnu.org; Tue, 03 Nov 2009 09:21:43 -0500
Received: from mx1.redhat.com ([209.132.183.28]:13168)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <mst@redhat.com>) id 1N5KGU-0007Uk-KH
	for qemu-devel@nongnu.org; Tue, 03 Nov 2009 09:21:42 -0500
Date: Tue, 3 Nov 2009 16:19:14 +0200
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20091103141914.GE5605@redhat.com>
References: <1256905286-25435-1-git-send-email-yamahata@valinux.co.jp>
	<1256905286-25435-27-git-send-email-yamahata@valinux.co.jp>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1256905286-25435-27-git-send-email-yamahata@valinux.co.jp>
Subject: [Qemu-devel] Re: [PATCH V6 26/32] pci: use range helper functions.
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 Fri, Oct 30, 2009 at 09:21:20PM +0900, Isaku Yamahata wrote:
> clean up pci_default_write_config() by the range helper functions.
> 
> Suggested by Michael S. Tsirkin <mst@redhat.com>
> Cc: 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.c |    8 ++------
>  1 files changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/hw/pci.c b/hw/pci.c
> index 67133b6..d9fd564 100644
> --- a/hw/pci.c
> +++ b/hw/pci.c
> @@ -699,19 +699,15 @@ uint32_t pci_default_read_config(PCIDevice *d,
>  
>  void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l)
>  {
> -    uint8_t orig[PCI_CONFIG_SPACE_SIZE];
>      int i;
>      uint32_t config_size = pci_config_size(d);
>  
> -    /* not efficient, but simple */
> -    memcpy(orig, d->config, PCI_CONFIG_SPACE_SIZE);
>      for(i = 0; i < l && addr < config_size; val >>= 8, ++i, ++addr) {
>          uint8_t wmask = d->wmask[addr];
>          d->config[addr] = (d->config[addr] & ~wmask) | (val & wmask);
>      }
> -    if (memcmp(orig + PCI_BASE_ADDRESS_0, d->config + PCI_BASE_ADDRESS_0, 24)
> -        || ((orig[PCI_COMMAND] ^ d->config[PCI_COMMAND])
> -            & (PCI_COMMAND_MEMORY | PCI_COMMAND_IO)))
> +    if (ranges_overlap(addr, l, PCI_BASE_ADDRESS_0, 24) ||
> +        range_covers_byte(addr, l, PCI_COMMAND))
>          pci_update_mappings(d);
>  }
>  
> -- 
> 1.6.0.2