From: Stefan Weil Date: Fri, 13 Nov 2009 22:26:27 +0000 (+0100) Subject: pci: Fix function pci_default_write_config X-Git-Tag: v0.12.0-rc0~317 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=91011d4f3b7c311a42b842f6682ac64a2372d2b7;p=users%2Fdwmw2%2Fqemu.git 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 Acked-by: Ryan Harper Signed-off-by: Aurelien Jarno --- diff --git a/hw/pci.c b/hw/pci.c index a326930d4f..6864339c27 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -856,9 +856,9 @@ void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l) 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) ||