summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2012-10-19 16:43:28 -0400
committerMichael S. Tsirkin <mst@redhat.com>2012-10-29 17:59:06 +0200
commitb56d701f1d1f1828c9fabea535b3460857546dd0 (patch)
tree1113757ebaace48f3e57794a92bf78c154c637ff
parente26631b74663f59b5873a84ed5b92ee4ddf48255 (diff)
downloadfocaccia-qemu-b56d701f1d1f1828c9fabea535b3460857546dd0.tar.gz
focaccia-qemu-b56d701f1d1f1828c9fabea535b3460857546dd0.zip
pci: pci capability must be in PCI space
pci capability must be in PCI space.
It can't lay in PCIe extended config space.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r--hw/pci.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/pci.c b/hw/pci.c
index 35cb374845..82c971a17d 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -1678,16 +1678,16 @@ 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)
             return offset;
+    }
     return 0;
 }