If there is a failure to setup one pci device, there maybe other
devices that can be initialized. Don't call rte_exit which
is a forced crash, pass the error back to the
application to decide what it wants to do.

Might be good idea to return a positive value for the
number of devices found, but that would break ABI.

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
---
 lib/librte_eal/common/eal_common_pci.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/librte_eal/common/eal_common_pci.c 
b/lib/librte_eal/common/eal_common_pci.c
index dcfe947..594ef9c 100644
--- a/lib/librte_eal/common/eal_common_pci.c
+++ b/lib/librte_eal/common/eal_common_pci.c
@@ -391,12 +391,13 @@ rte_eal_pci_probe(void)
        struct rte_pci_device *dev = NULL;
        struct rte_devargs *devargs;
        int probe_all = 0;
-       int ret = 0;
+       int failed = 0;

        if (rte_eal_devargs_type_count(RTE_DEVTYPE_WHITELISTED_PCI) == 0)
                probe_all = 1;

        TAILQ_FOREACH(dev, &pci_device_list, next) {
+               int ret = 0;

                /* set devargs in PCI structure */
                devargs = pci_devargs_lookup(dev);
@@ -409,13 +410,17 @@ rte_eal_pci_probe(void)
                else if (devargs != NULL &&
                        devargs->type == RTE_DEVTYPE_WHITELISTED_PCI)
                        ret = pci_probe_all_drivers(dev);
-               if (ret < 0)
-                       rte_exit(EXIT_FAILURE, "Requested device " PCI_PRI_FMT
-                                " cannot be used\n", dev->addr.domain, 
dev->addr.bus,
-                                dev->addr.devid, dev->addr.function);
+
+               if (ret < 0) {
+                       RTE_LOG(ERR, EAL,
+                               "Requested device " PCI_PRI_FMT " cannot be 
used\n",
+                               dev->addr.domain, dev->addr.bus,
+                               dev->addr.devid, dev->addr.function);
+                       failed = ret;
+               }
        }

-       return 0;
+       return failed;
 }

 /* dump one device */
-- 
2.1.4

Reply via email to