eal: check against common option on register
authorGaetan Rivet <gaetan.rivet@6wind.com>
Thu, 20 Dec 2018 17:06:44 +0000 (18:06 +0100)
committerThomas Monjalon <thomas@monjalon.net>
Tue, 15 Jan 2019 01:40:40 +0000 (02:40 +0100)
Not only check against other registered options, but also common EAL
options. This will mitigate user confusion.

Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
lib/librte_eal/common/rte_option.c

index d943638..ae8a0e2 100644 (file)
@@ -2,6 +2,7 @@
  * Copyright(c) 2018 Intel Corporation.
  */
 
+#include <getopt.h>
 #include <unistd.h>
 #include <string.h>
 
@@ -9,6 +10,8 @@
 #include <rte_option.h>
 
 #include "eal_private.h"
+#include "eal_internal_cfg.h" /* Necessary for eal_options.h */
+#include "eal_options.h"
 
 TAILQ_HEAD(rte_option_list, rte_option);
 
@@ -39,6 +42,17 @@ void __rte_experimental
 rte_option_register(struct rte_option *opt)
 {
        struct rte_option *option;
+       const struct option *gopt;
+
+       gopt = &eal_long_options[0];
+       while (gopt->name != NULL) {
+               if (strcmp(gopt->name, opt->name) == 0) {
+                       RTE_LOG(ERR, EAL, "Option %s is already a common EAL option.\n",
+                                       opt->name);
+                       return;
+               }
+               gopt++;
+       }
 
        TAILQ_FOREACH(option, &rte_option_list, next) {
                if (strcmp(opt->name, option->name) == 0) {