From patchwork Tue Apr 6 11:44:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 49506 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B7944B7D13 for ; Tue, 6 Apr 2010 22:07:50 +1000 (EST) Received: from localhost ([127.0.0.1]:34383 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nz7SB-0004S8-NO for incoming@patchwork.ozlabs.org; Tue, 06 Apr 2010 08:00:23 -0400 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 Received: from flocke.weilnetz.de (p54ADF876.dip.t-dialin.net [84.173.248.118]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0LaHLm-1NFcsf0mC6-00m484; Tue, 06 Apr 2010 13:46:11 +0200 Received: from stefan by flocke.weilnetz.de with local (Exim 4.71) (envelope-from ) id 1Nz7Dw-00082U-Bu; Tue, 06 Apr 2010 13:45:40 +0200 From: Stefan Weil To: QEMU Developers Date: Tue, 6 Apr 2010 13:44:08 +0200 Message-Id: <1270554249-24861-9-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1270554249-24861-1-git-send-email-weil@mail.berlios.de> References: <1270554249-24861-1-git-send-email-weil@mail.berlios.de> X-Provags-ID: V01U2FsdGVkX18hKRut3SnWpR63cjCekQg53ttc1hgU/6H116K zvhSA7FPA7fghl1gAbrrfHaMSWzYX/aGZMLtVOldeJi10EkK86 wdBXqIWtSw6+YOsWn0q2+2UiprjMTJI1bYsQEEblzonV+eDrxa EOA== X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH 8/9] eepro100: Fix mapping of flash memory X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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; }