From 16460b4c139d5951d5b36b80061d5afd31419041 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Mon, 22 Sep 2014 10:37:56 +0200 Subject: [PATCH] eal: factorise unsupported option handling Signed-off-by: David Marchand Acked-by: Neil Horman --- lib/librte_eal/bsdapp/eal/eal.c | 21 ++++++--------------- lib/librte_eal/linuxapp/eal/eal.c | 6 ++++++ 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c index ffdc441423..7e9f3aa518 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c @@ -626,24 +626,9 @@ eal_parse_args(int argc, char **argv) else if (!strcmp(lgopts[option_index].name, OPT_NO_SHCONF)) { internal_config.no_shconf = 1; } - else if (!strcmp(lgopts[option_index].name, OPT_HUGE_DIR)) { - RTE_LOG(ERR, EAL, "Option "OPT_HUGE_DIR" is not supported on" - "FreeBSD\n"); - return -1; - } else if (!strcmp(lgopts[option_index].name, OPT_PROC_TYPE)) { internal_config.process_type = eal_parse_proc_type(optarg); } - else if (!strcmp(lgopts[option_index].name, OPT_FILE_PREFIX)) { - RTE_LOG(ERR, EAL, "Option "OPT_FILE_PREFIX" is not supported on" - "FreeBSD\n"); - return -1; - } - else if (!strcmp(lgopts[option_index].name, OPT_SOCKET_MEM)) { - RTE_LOG(ERR, EAL, "Option "OPT_SOCKET_MEM" is not supported on" - "FreeBSD\n"); - return -1; - } else if (!strcmp(lgopts[option_index].name, OPT_PCI_BLACKLIST)) { if (rte_eal_devargs_add(RTE_DEVTYPE_BLACKLISTED_PCI, optarg) < 0) { @@ -684,6 +669,12 @@ eal_parse_args(int argc, char **argv) return -1; } internal_config.log_level = log; + } else { + RTE_LOG(ERR, EAL, "Option %s is not supported " + "on FreeBSD\n", + lgopts[option_index].name); + eal_usage(prgname); + return -1; } break; diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c index 633e3b8f8c..bf637440b3 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -938,6 +938,12 @@ eal_parse_args(int argc, char **argv) } else if (!strcmp(lgopts[option_index].name, OPT_CREATE_UIO_DEV)) { internal_config.create_uio_dev = 1; + } else { + RTE_LOG(ERR, EAL, "Option %s is not supported " + "on Linux\n", + lgopts[option_index].name); + eal_usage(prgname); + return -1; } break; -- 2.20.1