commit 91011d4f3b7c311a42b842f6682ac64a2372d2b7
author Stefan Weil <weil@mail.berlios.de> Fri Nov 13 23:26:27 2009 +0100
committer Aurelien Jarno <aurelien@aurel32.net> Sat Nov 14 01:14:26 2009 +0100
tree 33a8e3f2e6d2006dd29d6e255f5497fdd99a1bb8
parent e16ad5b0442931e6b76be246cf9dd2866ce352c8

pci: Fix function pci_default_write_config

Change 260c0cd3d985e51b15870ff47e17b7b930efbda1
(pci: use range helper functions) introduced a
bug which made pci cirrus vga on mips malta
(and maybe other pci devices) fail.

Don't change addr - its original value is needed
by ranges_overlap() and range_covers().

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Acked-by: Ryan Harper <ryanh@us.ibm.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

hw/pci.c

diff --git a/hw/pci.c b/hw/pci.c
index a326930..6864339 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -856,9 +856,9 @@
     int i;
     uint32_t config_size = pci_config_size(d);
 
-    for(i = 0; i < l && addr < config_size; val >>= 8, ++i, ++addr) {
-        uint8_t wmask = d->wmask[addr];
-        d->config[addr] = (d->config[addr] & ~wmask) | (val & wmask);
+    for (i = 0; i < l && addr + i < config_size; val >>= 8, ++i) {
+        uint8_t wmask = d->wmask[addr + i];
+        d->config[addr + i] = (d->config[addr + i] & ~wmask) | (val & wmask);
     }
     if (ranges_overlap(addr, l, PCI_BASE_ADDRESS_0, 24) ||
         ranges_overlap(addr, l, PCI_ROM_ADDRESS, 4) ||