From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NKBMz-0004IQ-8h
	for qemu-devel@nongnu.org; Mon, 14 Dec 2009 08:53:49 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NKBMu-0004AD-Cb
	for qemu-devel@nongnu.org; Mon, 14 Dec 2009 08:53:48 -0500
Received: from [199.232.76.173] (port=52349 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NKBMu-0004A0-5c
	for qemu-devel@nongnu.org; Mon, 14 Dec 2009 08:53:44 -0500
Received: from mx1.redhat.com ([209.132.183.28]:19389)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <mst@redhat.com>) id 1NKBMt-0006T8-Po
	for qemu-devel@nongnu.org; Mon, 14 Dec 2009 08:53:44 -0500
Date: Mon, 14 Dec 2009 15:50:59 +0200
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20091214135058.GI973@redhat.com>
References: <1260794906-30168-1-git-send-email-yamahata@valinux.co.jp>
	<1260794906-30168-11-git-send-email-yamahata@valinux.co.jp>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1260794906-30168-11-git-send-email-yamahata@valinux.co.jp>
Subject: [Qemu-devel] Re: [PATCH 10/11] piix_pci: use range helper function
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 Mon, Dec 14, 2009 at 09:48:25PM +0900, Isaku Yamahata wrote:
> use range helper function in i440fx_write_config().
> 
> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
> ---
>  hw/piix_pci.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/piix_pci.c b/hw/piix_pci.c
> index 7bbaf50..304f84a 100644
> --- a/hw/piix_pci.c
> +++ b/hw/piix_pci.c
> @@ -136,9 +136,11 @@ static void i440fx_write_config(PCIDevice *dev,
>  
>      /* XXX: implement SMRAM.D_LOCK */
>      pci_default_write_config(dev, address, val, len);
> -    if ((address >= I440FX_PAM0 && address <= I440FX_PAM6) ||
> -        address == I440FX_SMRAM)
> +    if (ranges_overlap(address, len,
> +                       I440FX_PAM0, I440FX_PAM6 - I440FX_PAM0 + 1) ||

So here
#define I440FX_PAM_SIZE 7
will be helpful.

> +        range_covers_byte(address, len, I440FX_SMRAM)) {
>          i440fx_update_memory_mappings(d);
> +    }
>  }
>  
>  static int i440fx_load_old(QEMUFile* f, void *opaque, int version_id)
> -- 
> 1.6.5.4