Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O0BNB-0005V3-SK for qemu-devel@nongnu.org; Fri, 09 Apr 2010 06:23:37 -0400 Received: from [140.186.70.92] (port=48913 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O0BN7-0005RG-S4 for qemu-devel@nongnu.org; Fri, 09 Apr 2010 06:23:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O0BN6-0004dd-EO for qemu-devel@nongnu.org; Fri, 09 Apr 2010 06:23:33 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:35514) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O0BN6-0004dH-5f for qemu-devel@nongnu.org; Fri, 09 Apr 2010 06:23:32 -0400 Date: Fri, 9 Apr 2010 19:20:48 +0900 From: Isaku Yamahata Message-ID: <20100409102048.GD14603@valinux.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] pci: fix pci_find_space() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" pci capability must be in PCI space. It can't lay in PCIe extended config space. Cc: "Michael S. Tsirkin" Signed-off-by: Isaku Yamahata --- hw/pci.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 2f6907b..f50568c 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -1701,10 +1701,9 @@ PCIDevice *pci_create_simple(PCIBus *bus, int devfn, const char *name) static int pci_find_space(PCIDevice *pdev, uint8_t size) { - int config_size = pci_config_size(pdev); int offset = PCI_CONFIG_HEADER_SIZE; int i; - for (i = PCI_CONFIG_HEADER_SIZE; i < config_size; ++i) + for (i = PCI_CONFIG_HEADER_SIZE; i < PCI_CONFIG_SPACE_SIZE - size; ++i) if (pdev->used[i]) offset = i + 1; else if (i - offset + 1 == size) -- 1.6.6.1