[dpdk-dev] [PATCH 4/5] eal: add an error code to plugin init for the next step

[Panu Matilainen]

Signed-off-by: Panu Matilainen <pmatilai at redhat.com>
---
 lib/librte_eal/bsdapp/eal/eal.c            | 3 ++-
 lib/librte_eal/common/eal_common_options.c | 3 ++-
 lib/librte_eal/common/eal_options.h        | 2 +-
 lib/librte_eal/linuxapp/eal/eal.c          | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index 73dab89..f07a3c3 100644
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -543,7 +543,8 @@ rte_eal_init(int argc, char **argv)

        rte_eal_mcfg_complete();

-       eal_plugins_init();
+       if (eal_plugins_init() < 0)
+               rte_panic("Cannot init plugins\n");

        eal_thread_init_master(rte_config.master_lcore);

diff --git a/lib/librte_eal/common/eal_common_options.c 
b/lib/librte_eal/common/eal_common_options.c
index f8fc68a..b542868 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -167,7 +167,7 @@ eal_plugin_add(const char *path)
        return 0;
 }

-void
+int
 eal_plugins_init(void)
 {
        struct shared_driver *solib = NULL;
@@ -178,6 +178,7 @@ eal_plugins_init(void)
                if (solib->lib_handle == NULL)
                        RTE_LOG(WARNING, EAL, "%s\n", dlerror());
        }
+       return 0;
 }

 /*
diff --git a/lib/librte_eal/common/eal_options.h 
b/lib/librte_eal/common/eal_options.h
index 1f96825..e305fe8 100644
--- a/lib/librte_eal/common/eal_options.h
+++ b/lib/librte_eal/common/eal_options.h
@@ -93,6 +93,6 @@ int eal_adjust_config(struct internal_config *internal_cfg);
 int eal_check_common_options(struct internal_config *internal_cfg);
 void eal_common_usage(void);
 enum rte_proc_type_t eal_proc_type_detect(void);
-void eal_plugins_init(void);
+int eal_plugins_init(void);

 #endif /* EAL_OPTIONS_H */
diff --git a/lib/librte_eal/linuxapp/eal/eal.c 
b/lib/librte_eal/linuxapp/eal/eal.c
index 455243e..26285e3 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -796,7 +796,8 @@ rte_eal_init(int argc, char **argv)

        rte_eal_mcfg_complete();

-       eal_plugins_init();
+       if (eal_plugins_init() < 0)
+               rte_panic("Cannot init plugins\n");

        eal_thread_init_master(rte_config.master_lcore);

-- 
2.4.3