X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_eal%2Fcommon%2Feal_common_devargs.c;h=6ac88d6ab77171e5e986f8843e5a77e38eb6df59;hb=b631f3b0f24276855c2e6e9ef9dc7c2292a1ccd8;hp=33e9f0a93592fe41ec1fa66792c8524e52616177;hpb=4d0e2a5da74b030aa4f98c8d6249b2b47fca2317;p=dpdk.git diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c index 33e9f0a935..6ac88d6ab7 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;