From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N94bG-0004qR-MX for qemu-devel@nongnu.org; Fri, 13 Nov 2009 17:26:38 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N94bC-0004kP-6y for qemu-devel@nongnu.org; Fri, 13 Nov 2009 17:26:38 -0500 Received: from [199.232.76.173] (port=48030 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N94bC-0004k3-1H for qemu-devel@nongnu.org; Fri, 13 Nov 2009 17:26:34 -0500 Received: from moutng.kundenserver.de ([212.227.126.186]:54925) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N94bB-00028H-6L for qemu-devel@nongnu.org; Fri, 13 Nov 2009 17:26:33 -0500 From: Stefan Weil Date: Fri, 13 Nov 2009 23:26:27 +0100 Message-Id: <1258151187-10003-1-git-send-email-weil@mail.berlios.de> Subject: [Qemu-devel] [PATCH] pci: Fix function pci_default_write_config List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- hw/pci.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) 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 @@ 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) || -- 1.5.6.5