When adding rte_devargs to the list, a check is performed on the
intended bus that should use this rte_devargs. This bus configuration is
for the time being only set once when the first rte_devargs is added to
it. If the bus configuration has previously been set, then the rte_devargs
insertion fails.
Failure occuring upon detection of the set configuration is an API
change. While rules will certainly be enforced in the next rte_devargs
API, none were previously enforced and this should be respected until
this API is deprecated.
The bus configuration is meant to evolve soon, but in the meantime it
should strictly follow the current rte_eal_devargs_add API.
The rte_devargs unit tests are failing due to this API change. Revert
this evolution, it will be reintroduced properly in the next release if
necessary.
Signed-off-by: Gaetan Rivet <gaetan.ri...@6wind.com>
---
lib/librte_eal/common/eal_common_devargs.c | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_devargs.c
b/lib/librte_eal/common/eal_common_devargs.c
index 33e9f0a..6ac88d6 100644
--- a/lib/librte_eal/common/eal_common_devargs.c
+++ b/lib/librte_eal/common/eal_common_devargs.c
@@ -170,22 +170,12 @@ 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 (devargs->policy == RTE_DEV_WHITELISTED) {
- if (bus->conf.scan_mode == RTE_BUS_SCAN_UNDEFINED) {
+ if (bus->conf.scan_mode == RTE_BUS_SCAN_UNDEFINED) {
+ if (devargs->policy == RTE_DEV_WHITELISTED)
bus->conf.scan_mode = RTE_BUS_SCAN_WHITELIST;
- } else if (bus->conf.scan_mode == RTE_BUS_SCAN_BLACKLIST) {
- fprintf(stderr, "ERROR: incompatible device policy and
bus scan mode\n");
- goto fail;
- }
- } else if (devargs->policy == RTE_DEV_BLACKLISTED) {
- if (bus->conf.scan_mode == RTE_BUS_SCAN_UNDEFINED) {
+ else if (devargs->policy == RTE_DEV_BLACKLISTED)
bus->conf.scan_mode = RTE_BUS_SCAN_BLACKLIST;
- } else if (bus->conf.scan_mode == RTE_BUS_SCAN_WHITELIST) {
- fprintf(stderr, "ERROR: incompatible device policy and
bus scan mode\n");
- goto fail;
- }
}
-
TAILQ_INSERT_TAIL(&devargs_list, devargs, next);
return 0;
--
2.1.4
