This bus configuration item is misnamed, as it actually refers to the probing process.
Signed-off-by: Gaetan Rivet <gaetan.ri...@6wind.com> --- drivers/bus/pci/pci_common.c | 2 +- lib/librte_eal/common/eal_common_devargs.c | 6 +++--- lib/librte_eal/common/include/rte_bus.h | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c index d7a1c05..cc23a39 100644 --- a/drivers/bus/pci/pci_common.c +++ b/drivers/bus/pci/pci_common.c @@ -373,7 +373,7 @@ rte_pci_probe(void) int probe_all = 0; int ret = 0; - if (rte_pci_bus.bus.conf.scan_mode != RTE_BUS_SCAN_WHITELIST) + if (rte_pci_bus.bus.conf.probe_mode != RTE_BUS_PROBE_WHITELIST) probe_all = 1; FOREACH_DEVICE_ON_PCIBUS(dev) { diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c index 6ac88d6..f5ef913 100644 --- a/lib/librte_eal/common/eal_common_devargs.c +++ b/lib/librte_eal/common/eal_common_devargs.c @@ -170,11 +170,11 @@ rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str) bus = devargs->bus; if (devargs->type == RTE_DEVTYPE_BLACKLISTED_PCI) devargs->policy = RTE_DEV_BLACKLISTED; - if (bus->conf.scan_mode == RTE_BUS_SCAN_UNDEFINED) { + if (bus->conf.probe_mode == RTE_BUS_PROBE_UNDEFINED) { if (devargs->policy == RTE_DEV_WHITELISTED) - bus->conf.scan_mode = RTE_BUS_SCAN_WHITELIST; + bus->conf.probe_mode = RTE_BUS_PROBE_WHITELIST; else if (devargs->policy == RTE_DEV_BLACKLISTED) - bus->conf.scan_mode = RTE_BUS_SCAN_BLACKLIST; + bus->conf.probe_mode = RTE_BUS_PROBE_BLACKLIST; } TAILQ_INSERT_TAIL(&devargs_list, devargs, next); return 0; diff --git a/lib/librte_eal/common/include/rte_bus.h b/lib/librte_eal/common/include/rte_bus.h index 6fb0834..331d954 100644 --- a/lib/librte_eal/common/include/rte_bus.h +++ b/lib/librte_eal/common/include/rte_bus.h @@ -168,19 +168,19 @@ typedef int (*rte_bus_unplug_t)(struct rte_device *dev); typedef int (*rte_bus_parse_t)(const char *name, void *addr); /** - * Bus scan policies + * Bus probe policies */ -enum rte_bus_scan_mode { - RTE_BUS_SCAN_UNDEFINED, - RTE_BUS_SCAN_WHITELIST, - RTE_BUS_SCAN_BLACKLIST, +enum rte_bus_probe_mode { + RTE_BUS_PROBE_UNDEFINED, + RTE_BUS_PROBE_WHITELIST, + RTE_BUS_PROBE_BLACKLIST, }; /** * A structure used to configure bus operations. */ struct rte_bus_conf { - enum rte_bus_scan_mode scan_mode; /**< Scan policy. */ + enum rte_bus_probe_mode probe_mode; /**< Probe policy. */ }; -- 2.1.4