diff options
author | jhb <jhb@FreeBSD.org> | 2016-09-30 01:13:57 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2016-09-30 01:13:57 +0000 |
commit | 052839dc77fe6edfe29682625c568465791c9f8f (patch) | |
tree | 763970cf0e269dc2086a290e054643da6b5f13ae /share | |
parent | 9cd96c281de542b627873b9106cff2dceab6e654 (diff) | |
download | FreeBSD-src-052839dc77fe6edfe29682625c568465791c9f8f.zip FreeBSD-src-052839dc77fe6edfe29682625c568465791c9f8f.tar.gz |
MFC 303881: Reliably return PCI_GETCONF_LAST_DEVICE from PCIOCGETCONF.
Previously the loop in PCIIOCGETCONF would terminate as soon as it
found enough matches. Now it will continue iterating through the
PCI device list and only terminate if it finds another matching device
for which it has no room to store a conf structure. This means that
PCI_GETCONF_LAST_DEVICE is reliably returned when the number of
matching devices is equal to the number of slots in the matches
buffer. For example, if a program requests the conf structure for a
single PCI function with a specified domain/bus/slot/function it will
now get PCI_GETCONF_LAST_DEVICE instead of PCI_GETCONF_MORE_DEVS.
While here, simplify the loop conditional a bit more by explicitly
breaking out of the loop if copyout() fails and removing a redundant
i < pci_numdevs check.
Sponsored by: Chelsio Communications
Diffstat (limited to 'share')
-rw-r--r-- | share/man/man4/pci.4 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/share/man/man4/pci.4 b/share/man/man4/pci.4 index 2cdc71b..7623a9a 100644 --- a/share/man/man4/pci.4 +++ b/share/man/man4/pci.4 @@ -254,7 +254,8 @@ The status tells the user the disposition of his request for a device list. The possible status values are: .Bl -ohang .It PCI_GETCONF_LAST_DEVICE -This means that there are no more devices in the PCI device list after the +This means that there are no more devices in the PCI device list matching +the specified criteria after the ones returned in the .Va matches buffer. @@ -270,9 +271,7 @@ and to zero to start over at the beginning of the list. .It PCI_GETCONF_MORE_DEVS This tells the user that his buffer was not large enough to hold all of the -remaining devices in the device list that possibly match his criteria. -It is possible for this status to be returned, even when none of the remaining -devices in the list would match the user's criteria. +remaining devices in the device list that match his criteria. .It PCI_GETCONF_ERROR This indicates a general error while servicing the user's request. If the |