eal: sort and align options lists

[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 89f3b5e..e3955e7 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -352,17 +352,14 @@ eal_usage(const char *prgname)
        printf("\nUsage: %s ", prgname);
        eal_common_usage();
        printf("EAL Linux options:\n"
-              "  -d LIB.so    : add driver (can be used multiple times)\n"
-              "  --"OPT_XEN_DOM0" : support application running on Xen Domain0 "
-                          "without hugetlbfs\n"
-              "  --"OPT_SOCKET_MEM" : memory to allocate on specific\n"
-                  "                 sockets (use comma separated values)\n"
-              "  --"OPT_HUGE_DIR"   : directory where hugetlbfs is mounted\n"
-              "  --"OPT_FILE_PREFIX": prefix for hugepage filenames\n"
-              "  --"OPT_BASE_VIRTADDR": specify base virtual address\n"
-              "  --"OPT_VFIO_INTR": specify desired interrupt mode for VFIO "
-                          "(legacy|msi|msix)\n"
-              "  --"OPT_CREATE_UIO_DEV": create /dev/uioX (usually done by hotplug)\n"
+              "  -d LIB.so           Add driver (can be used multiple times)\n"
+              "  --"OPT_SOCKET_MEM"        Memory to allocate on sockets (comma separated values)\n"
+              "  --"OPT_HUGE_DIR"          Directory where hugetlbfs is mounted\n"
+              "  --"OPT_FILE_PREFIX"       Prefix for hugepage filenames\n"
+              "  --"OPT_BASE_VIRTADDR"     Base virtual address\n"
+              "  --"OPT_CREATE_UIO_DEV"    Create /dev/uioX (usually done by hotplug)\n"
+              "  --"OPT_VFIO_INTR"         Interrupt mode for VFIO (legacy|msi|msix)\n"
+              "  --"OPT_XEN_DOM0"          Support running on Xen dom0 without hugetlbfs\n"
               "\n");
        /* Allow the application to print its usage message too if hook is set */
        if ( rte_application_usage_hook ) {
@@ -458,7 +455,7 @@ eal_parse_base_virtaddr(const char *arg)
         * it can align to 2MB for x86. So this alignment can also be used
         * on x86 */
        internal_config.base_virtaddr =
-               RTE_PTR_ALIGN_CEIL((uintptr_t)addr, RTE_PGSIZE_16M);
+               RTE_PTR_ALIGN_CEIL((uintptr_t)addr, (size_t)RTE_PGSIZE_16M);
 
        return 0;
 }
@@ -859,3 +856,31 @@ int rte_eal_has_hugepages(void)
 {
        return ! internal_config.no_hugetlbfs;
 }
+
+int
+rte_eal_check_module(const char *module_name)
+{
+       char mod_name[30]; /* Any module names can be longer than 30 bytes? */
+       int ret = 0;
+       int n;
+
+       if (NULL == module_name)
+               return -1;
+
+       FILE *fd = fopen("/proc/modules", "r");
+       if (NULL == fd) {
+               RTE_LOG(ERR, EAL, "Open /proc/modules failed!"
+                       " error %i (%s)\n", errno, strerror(errno));
+               return -1;
+       }
+       while (!feof(fd)) {
+               n = fscanf(fd, "%29s %*[^\n]", mod_name);
+               if ((n == 1) && !strcmp(mod_name, module_name)) {
+                       ret = 1;
+                       break;
+               }
+       }
+       fclose(fd);
+
+       return ret;
+}