From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nz7Ec-0000qP-KS for qemu-devel@nongnu.org; Tue, 06 Apr 2010 07:46:22 -0400 Received: from [140.186.70.92] (port=47349 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nz7Eb-0000q8-AT for qemu-devel@nongnu.org; Tue, 06 Apr 2010 07:46:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nz7EX-0000QZ-0j for qemu-devel@nongnu.org; Tue, 06 Apr 2010 07:46:21 -0400 Received: from moutng.kundenserver.de ([212.227.126.187]:49470) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nz7EW-0000QR-J2 for qemu-devel@nongnu.org; Tue, 06 Apr 2010 07:46:16 -0400 From: Stefan Weil Date: Tue, 6 Apr 2010 13:44:08 +0200 Message-Id: <1270554249-24861-9-git-send-email-weil@mail.berlios.de> In-Reply-To: <1270554249-24861-1-git-send-email-weil@mail.berlios.de> References: <1270554249-24861-1-git-send-email-weil@mail.berlios.de> Subject: [Qemu-devel] [PATCH 8/9] eepro100: Fix mapping of flash memory List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers Cc: "Michael S. Tsirkin" Signed-off-by: Stefan Weil --- 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) { + /* Map control / status registers and flash. */ cpu_register_physical_memory(addr, size, s->mmio_index); s->region[region_num] = addr; } -- 1.7.0