qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Weil <weil@mail.berlios.de>
To: QEMU Developers <qemu-devel@nongnu.org>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Subject: [Qemu-devel] [PATCH 8/9] eepro100: Fix mapping of flash memory
Date: Tue,  6 Apr 2010 13:44:08 +0200	[thread overview]
Message-ID: <1270554249-24861-9-git-send-email-weil@mail.berlios.de> (raw)
In-Reply-To: <1270554249-24861-1-git-send-email-weil@mail.berlios.de>

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

  parent reply	other threads:[~2010-04-06 11:46 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-06 11:44 [Qemu-devel] eepro100: New patches Stefan Weil
2010-04-06 11:44 ` [Qemu-devel] [PATCH 1/9] eepro100: Don't allow writing SCBStatus Stefan Weil
2010-04-06 11:44 ` [Qemu-devel] [PATCH 2/9] eepro100: Simplify status handling Stefan Weil
2010-04-06 12:18   ` [Qemu-devel] " Michael S. Tsirkin
2010-04-06 14:29     ` Stefan Weil
2010-04-06 14:34       ` Michael S. Tsirkin
2010-04-06 11:44 ` [Qemu-devel] [PATCH 3/9] eepro100: Simplified device instantiation Stefan Weil
2010-04-06 11:44 ` [Qemu-devel] [PATCH 4/9] eepro100: Add new device variant i82801 Stefan Weil
2010-04-06 11:44 ` [Qemu-devel] [PATCH 5/9] eepro100: Set configuration bit for standard TCB Stefan Weil
2010-04-06 11:44 ` [Qemu-devel] [PATCH 6/9] eepro100: Support compilation without EEPROM Stefan Weil
2010-04-06 12:10   ` [Qemu-devel] " Michael S. Tsirkin
2010-04-06 14:26     ` Stefan Weil
2010-04-06 15:44   ` [Qemu-devel] " Richard Henderson
2010-04-06 16:01     ` Stefan Weil
2010-04-06 16:35       ` Richard Henderson
2010-04-07  1:00   ` Paul Brook
2010-04-07  7:02     ` Stefan Weil
2010-04-07  7:29       ` Michael S. Tsirkin
2010-04-06 11:44 ` [Qemu-devel] [PATCH 7/9] eepro100: Set power management capability using pci_reserve_capability Stefan Weil
2010-04-06 12:09   ` [Qemu-devel] " Michael S. Tsirkin
2010-04-06 11:44 ` Stefan Weil [this message]
2010-04-06 11:57   ` [Qemu-devel] Re: [PATCH 8/9] eepro100: Fix mapping of flash memory Michael S. Tsirkin
2010-04-06 14:23     ` Stefan Weil
2010-04-06 14:30       ` Michael S. Tsirkin
2010-04-06 11:44 ` [Qemu-devel] [PATCH 9/9] eepro100: Fix PCI interrupt pin configuration regression Stefan Weil
2010-04-06 11:55   ` [Qemu-devel] " Michael S. Tsirkin
2010-04-06 12:40 ` [Qemu-devel] Re: eepro100: New patches Michael S. Tsirkin
2010-04-06 16:09   ` Stefan Weil
2010-04-07  8:10     ` Michael S. Tsirkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1270554249-24861-9-git-send-email-weil@mail.berlios.de \
    --to=weil@mail.berlios.de \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).