eal: factorize options sanity check

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

diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index 7a1d087..f5de277 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -507,39 +507,12 @@ eal_parse_args(int argc, char **argv)
        int opt, ret, i;
        char **argvopt;
        int option_index;
-       int coremask_ok = 0;
        char *prgname = argv[0];
        struct shared_driver *solib;
 
        argvopt = argv;
 
-       internal_config.memory = 0;
-       internal_config.force_nrank = 0;
-       internal_config.force_nchannel = 0;
-       internal_config.hugefile_prefix = HUGEFILE_PREFIX_DEFAULT;
-       internal_config.hugepage_dir = NULL;
-       internal_config.force_sockets = 0;
-       internal_config.syslog_facility = LOG_DAEMON;
-       /* default value from build option */
-       internal_config.log_level = RTE_LOG_LEVEL;
-       internal_config.xen_dom0_support = 0;
-       /* if set to NONE, interrupt mode is determined automatically */
-       internal_config.vfio_intr_mode = RTE_INTR_MODE_NONE;
-#ifdef RTE_LIBEAL_USE_HPET
-       internal_config.no_hpet = 0;
-#else
-       internal_config.no_hpet = 1;
-#endif
-       /* zero out the NUMA config */
-       for (i = 0; i < RTE_MAX_NUMA_NODES; i++)
-               internal_config.socket_mem[i] = 0;
-
-       /* zero out hugedir descriptors */
-       for (i = 0; i < MAX_HUGEPAGE_SIZES; i++)
-               internal_config.hugepage_info[i].lock_descriptor = -1;
-
-       internal_config.vmware_tsc_map = 0;
-       internal_config.base_virtaddr = 0;
+       eal_reset_internal_config(&internal_config);
 
        while ((opt = getopt_long(argc, argvopt, eal_short_options,
                                  eal_long_options, &option_index)) != EOF) {
@@ -557,13 +530,8 @@ eal_parse_args(int argc, char **argv)
                        return -1;
                }
                /* common parser handled this option */
-               if (ret == 0) {
-                       /* special case, note that the common parser accepted
-                        * the coremask option */
-                       if (opt == 'c')
-                               coremask_ok = 1;
+               if (ret == 0)
                        continue;
-               }
 
                switch (opt) {
                /* force loading of external driver */
@@ -648,58 +616,19 @@ eal_parse_args(int argc, char **argv)
                }
        }
 
-       /* sanity checks */
-       if (!coremask_ok) {
-               RTE_LOG(ERR, EAL, "coremask not specified\n");
-               eal_usage(prgname);
-               return -1;
-       }
-       if (internal_config.process_type == RTE_PROC_AUTO){
+       if (internal_config.process_type == RTE_PROC_AUTO)
                internal_config.process_type = eal_proc_type_detect();
-       }
-       if (internal_config.process_type == RTE_PROC_INVALID){
-               RTE_LOG(ERR, EAL, "Invalid process type specified\n");
-               eal_usage(prgname);
-               return -1;
-       }
-       if (internal_config.process_type == RTE_PROC_PRIMARY &&
-                       internal_config.force_nchannel == 0) {
-               RTE_LOG(ERR, EAL, "Number of memory channels (-n) not specified\n");
-               eal_usage(prgname);
-               return -1;
-       }
-       if (index(internal_config.hugefile_prefix,'%') != NULL){
-               RTE_LOG(ERR, EAL, "Invalid char, '%%', in '"OPT_FILE_PREFIX"' option\n");
-               eal_usage(prgname);
-               return -1;
-       }
-       if (internal_config.memory > 0 && internal_config.force_sockets == 1) {
-               RTE_LOG(ERR, EAL, "Options -m and --socket-mem cannot be specified "
-                               "at the same time\n");
-               eal_usage(prgname);
-               return -1;
-       }
-       /* --no-huge doesn't make sense with either -m or --socket-mem */
-       if (internal_config.no_hugetlbfs &&
-                       (internal_config.memory > 0 ||
-                                       internal_config.force_sockets == 1)) {
-               RTE_LOG(ERR, EAL, "Options -m or --socket-mem cannot be specified "
-                               "together with --no-huge!\n");
+
+       /* sanity checks */
+       if (eal_check_common_options(&internal_config) != 0) {
                eal_usage(prgname);
                return -1;
        }
+
        /* --xen-dom0 doesn't make sense with --socket-mem */
        if (internal_config.xen_dom0_support && internal_config.force_sockets == 1) {
-               RTE_LOG(ERR, EAL, "Options --socket-mem cannot be specified "
-                                       "together with --xen_dom0!\n");
-               eal_usage(prgname);
-               return -1;
-       }
-
-       if (rte_eal_devargs_type_count(RTE_DEVTYPE_WHITELISTED_PCI) != 0 &&
-               rte_eal_devargs_type_count(RTE_DEVTYPE_BLACKLISTED_PCI) != 0) {
-               RTE_LOG(ERR, EAL, "Error: blacklist [-b] and whitelist "
-                       "[-w] options cannot be used at the same time\n");
+               RTE_LOG(ERR, EAL, "Options --"OPT_SOCKET_MEM" cannot be specified "
+                       "together with --"OPT_XEN_DOM0"\n");
                eal_usage(prgname);
                return -1;
        }