From patchwork Tue Oct 9 03:30:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v2,03/21] pci: pci capability must be in PCI space Date: Mon, 08 Oct 2012 17:30:25 -0000 From: Jason Baron X-Patchwork-Id: 190179 Message-Id: <267c819bbf776d4938d67545c9bdef6b4f03bcb0.1349749915.git.jbaron@redhat.com> To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, juzhang@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, armbru@redhat.com, agraf@suse.de, blauwirbel@gmail.com, yamahata@valinux.co.jp, alex.williamson@redhat.com, kevin@koconnor.net, avi@redhat.com, mkletzan@redhat.com, pbonzini@redhat.com, lcapitulino@redhat.com, afaerber@suse.de, kraxel@redhat.com From: Isaku Yamahata pci capability must be in PCI space. It can't lay in PCIe extended config space. Signed-off-by: Isaku Yamahata Signed-off-by: Jason Baron Reviewed-by: Paolo Bonzini --- hw/pci.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index f855cf3..85ebef6 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -1626,12 +1626,11 @@ PCIDevice *pci_create_simple(PCIBus *bus, int devfn, const char *name) return pci_create_simple_multifunction(bus, devfn, false, name); } -static int pci_find_space(PCIDevice *pdev, uint8_t size) +static uint8_t 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; ++i) if (pdev->used[i]) offset = i + 1; else if (i - offset + 1 == size)