eal: do not panic on bus probe/scan failure

[dpdk.git] / lib / librte_eal / bsdapp / eal / eal.c

diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index ff4225f..4ee9c66 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -593,8 +593,10 @@ rte_eal_init(int argc, char **argv)
                return -1;
        }
 
-       if (rte_eal_intr_init() < 0)
-               rte_panic("Cannot init interrupt-handling thread\n");
+       if (rte_eal_intr_init() < 0) {
+               rte_eal_init_alert("Cannot init interrupt-handling thread\n");
+               return -1;
+       }
 
        if (rte_eal_timer_init() < 0) {
                rte_eal_init_alert("Cannot init HPET or TSC timers\n");
@@ -602,13 +604,17 @@ rte_eal_init(int argc, char **argv)
                return -1;
        }
 
-       if (rte_eal_pci_init() < 0)
-               rte_panic("Cannot init PCI\n");
+       if (rte_eal_pci_init() < 0) {
+               rte_eal_init_alert("Cannot init PCI\n");
+               rte_errno = EPROTO;
+               rte_atomic32_clear(&run_once);
+               return -1;
+       }
 
        eal_check_mem_on_local_socket();
 
        if (eal_plugins_init() < 0)
-               rte_panic("Cannot init plugins\n");
+               rte_eal_init_alert("Cannot init plugins\n");
 
        eal_thread_init_master(rte_config.master_lcore);
 
@@ -618,8 +624,11 @@ rte_eal_init(int argc, char **argv)
                rte_config.master_lcore, thread_id, cpuset,
                ret == 0 ? "" : "...");
 
-       if (rte_bus_scan())
-               rte_panic("Cannot scan the buses for devices\n");
+       if (rte_bus_scan()) {
+               rte_eal_init_alert("Cannot scan the buses for devices\n");
+               rte_errno = ENODEV;
+               return -1;
+       }
 
        RTE_LCORE_FOREACH_SLAVE(i) {
 
@@ -654,15 +663,21 @@ rte_eal_init(int argc, char **argv)
        rte_eal_mp_wait_lcore();
 
        /* Probe all the buses and devices/drivers on them */
-       if (rte_bus_probe())
-               rte_panic("Cannot probe devices\n");
+       if (rte_bus_probe()) {
+               rte_eal_init_alert("Cannot probe devices\n");
+               rte_errno = ENOTSUP;
+               return -1;
+       }
 
        /* Probe & Initialize PCI devices */
-       if (rte_eal_pci_probe())
-               rte_panic("Cannot probe PCI\n");
+       if (rte_eal_pci_probe()) {
+               rte_eal_init_alert("Cannot probe PCI\n");
+               rte_errno = ENOTSUP;
+               return -1;
+       }
 
        if (rte_eal_dev_init() < 0)
-               rte_panic("Cannot init pmd devices\n");
+               rte_eal_init_alert("Cannot init pmd devices\n");
 
        rte_eal_mcfg_complete();