From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N956o-0003Vw-MU for qemu-devel@nongnu.org; Fri, 13 Nov 2009 17:59:14 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N956k-0003Ru-54 for qemu-devel@nongnu.org; Fri, 13 Nov 2009 17:59:14 -0500 Received: from [199.232.76.173] (port=51895 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N956k-0003Rj-2T for qemu-devel@nongnu.org; Fri, 13 Nov 2009 17:59:10 -0500 Received: from e37.co.us.ibm.com ([32.97.110.158]:55786) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1N956j-0006xb-Bg for qemu-devel@nongnu.org; Fri, 13 Nov 2009 17:59:09 -0500 Received: from d03relay05.boulder.ibm.com (d03relay05.boulder.ibm.com [9.17.195.107]) by e37.co.us.ibm.com (8.14.3/8.13.1) with ESMTP id nADMvwN8009871 for ; Fri, 13 Nov 2009 15:57:58 -0700 Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay05.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id nADMx1AJ162918 for ; Fri, 13 Nov 2009 15:59:02 -0700 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id nADGs9rV023924 for ; Fri, 13 Nov 2009 09:54:09 -0700 Date: Fri, 13 Nov 2009 16:58:58 -0600 From: Ryan Harper Subject: Re: [Qemu-devel] [PATCH] pci: Fix function pci_default_write_config Message-ID: <20091113225858.GM11154@us.ibm.com> References: <1258151187-10003-1-git-send-email-weil@mail.berlios.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1258151187-10003-1-git-send-email-weil@mail.berlios.de> List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Weil Cc: qemu-devel@nongnu.org * Stefan Weil [2009-11-13 16:29]: > 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 This fixes the fedora 9 boot from dvd issue I've seen. Acked-by: Ryan Harper > --- > 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 > > -- Ryan Harper Software Engineer; Linux Technology Center IBM Corp., Austin, Tx ryanh@us.ibm.com