Corrected default size of PCIe Cap Structure from 0x3c to 0x34. 0x34 is min size for version 2 Cap Structure for an endpoint.
0x3c value failed on a real device that aligned this structure at 0xcc, exceeding the size of the config_map[] by 8 bytes. Signed-off-by: Donald Dutile <[email protected]> cc: Alex Williamson <[email protected]> cc: Michael S. Tsirkin <[email protected]> --- hw/device-assignment.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/hw/device-assignment.c b/hw/device-assignment.c index 36ad6b0..1d2ee5d 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -1422,12 +1422,14 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev) uint8_t version; uint16_t type, devctl, lnkcap, lnksta; uint32_t devcap; - int size = 0x3c; /* version 2 size */ version = pci_get_byte(pci_dev->config + pos + PCI_EXP_FLAGS); version &= PCI_EXP_FLAGS_VERS; if (version == 1) { size = 0x14; + } else if (version == 2) { + /* don't include slot cap/stat/ctrl 2 regs; only support endpoints */ + size = 0x34; } else if (version > 2) { fprintf(stderr, "Unsupported PCI express capability version %d\n", version); -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
