From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Nz7TP-0005Tw-B9
	for qemu-devel@nongnu.org; Tue, 06 Apr 2010 08:01:39 -0400
Received: from [140.186.70.92] (port=48636 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Nz7TO-0005TJ-1U
	for qemu-devel@nongnu.org; Tue, 06 Apr 2010 08:01:38 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <mst@redhat.com>) id 1Nz7TL-0002Eu-KC
	for qemu-devel@nongnu.org; Tue, 06 Apr 2010 08:01:37 -0400
Received: from mx1.redhat.com ([209.132.183.28]:10653)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <mst@redhat.com>) id 1Nz7TK-0002Ef-Qq
	for qemu-devel@nongnu.org; Tue, 06 Apr 2010 08:01:35 -0400
Date: Tue, 6 Apr 2010 14:57:52 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20100406115752.GB16539@redhat.com>
References: <1270554249-24861-1-git-send-email-weil@mail.berlios.de>
	<1270554249-24861-9-git-send-email-weil@mail.berlios.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1270554249-24861-9-git-send-email-weil@mail.berlios.de>
Subject: [Qemu-devel] Re: [PATCH 8/9] eepro100: Fix mapping of flash memory
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: Stefan Weil <weil@mail.berlios.de>
Cc: QEMU Developers <qemu-devel@nongnu.org>

On Tue, Apr 06, 2010 at 01:44:08PM +0200, Stefan Weil wrote:
> Signed-off-by: Stefan Weil <weil@mail.berlios.de>
> ---
>  hw/eepro100.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/eepro100.c b/hw/eepro100.c
> index f0acdbc..2401888 100644
> --- a/hw/eepro100.c
> +++ b/hw/eepro100.c
> @@ -1622,8 +1622,9 @@ static void pci_mmio_map(PCIDevice * pci_dev, int region_num,
>            "size=0x%08"FMT_PCIBUS", type=%d\n",
>            region_num, addr, size, type));
>  
> -    if (region_num == 0) {
> -        /* Map control / status registers. */
> +    assert(region_num == 0 || region_num == 2);
> +    if (region_num == 0 || region_num == 2) {

Looks a bit strange ...  Why do we need the if here?

> +        /* Map control / status registers and flash. */
>          cpu_register_physical_memory(addr, size, s->mmio_index);
>          s->region[region_num] = addr;
>      }
> -- 
> 1.7.0