remove unneeded tests for NULL when freeing

[dpdk.git] / lib / librte_eal / common / eal_common_devargs.c

diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c
index 4c7d11a..2bfe54a 100644 (file)
--- a/lib/librte_eal/common/eal_common_devargs.c
+++ b/lib/librte_eal/common/eal_common_devargs.c
@@ -31,11 +31,15 @@
  */
 
 /* This file manages the list of devices and their arguments, as given
- * by the user at startup */
+ * by the user at startup
+ *
+ * Code here should not call rte_log since the EAL environment
+ * may not be initialized.
+ */
 
+#include <stdio.h>
 #include <string.h>
 
-#include <rte_log.h>
 #include <rte_pci.h>
 #include <rte_devargs.h>
 #include "eal_private.h"
@@ -44,65 +48,85 @@
 struct rte_devargs_list devargs_list =
        TAILQ_HEAD_INITIALIZER(devargs_list);
 
-/* store a whitelist parameter for later parsing */
 int
-rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)
+rte_eal_parse_devargs_str(const char *devargs_str,
+                       char **drvname, char **drvargs)
 {
-       struct rte_devargs *devargs;
-       char buf[RTE_DEVARGS_LEN];
        char *sep;
-       int ret;
 
-       ret = snprintf(buf, sizeof(buf), "%s", devargs_str);
-       if (ret < 0 || ret >= (int)sizeof(buf)) {
-               RTE_LOG(ERR, EAL, "user device args too large: <%s>\n",
-                       devargs_str);
+       if ((devargs_str) == NULL || (drvname) == NULL || (drvargs == NULL))
                return -1;
-       }
 
-       /* use malloc instead of rte_malloc as it's called early at init */
-       devargs = malloc(sizeof(*devargs));
-       if (devargs == NULL) {
-               RTE_LOG(ERR, EAL, "cannot allocate devargs\n");
+       *drvname = strdup(devargs_str);
+       if (drvname == NULL)
                return -1;
-       }
-       memset(devargs, 0, sizeof(*devargs));
-       devargs->type = devtype;
 
        /* set the first ',' to '\0' to split name and arguments */
-       sep = strchr(buf, ',');
+       sep = strchr(*drvname, ',');
        if (sep != NULL) {
                sep[0] = '\0';
-               snprintf(devargs->args, sizeof(devargs->args), "%s", sep + 1);
+               *drvargs = strdup(sep + 1);
+       } else {
+               *drvargs = strdup("");
        }
 
+       if (*drvargs == NULL) {
+               free(*drvname);
+               return -1;
+       }
+       return 0;
+}
+
+/* store a whitelist parameter for later parsing */
+int
+rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)
+{
+       struct rte_devargs *devargs = NULL;
+       char *buf = NULL;
+       int ret;
+
+       /* use malloc instead of rte_malloc as it's called early at init */
+       devargs = malloc(sizeof(*devargs));
+       if (devargs == NULL)
+               goto fail;
+
+       memset(devargs, 0, sizeof(*devargs));
+       devargs->type = devtype;
+
+       if (rte_eal_parse_devargs_str(devargs_str, &buf, &devargs->args))
+               goto fail;
+
        switch (devargs->type) {
        case RTE_DEVTYPE_WHITELISTED_PCI:
        case RTE_DEVTYPE_BLACKLISTED_PCI:
                /* try to parse pci identifier */
                if (eal_parse_pci_BDF(buf, &devargs->pci.addr) != 0 &&
-                       eal_parse_pci_DomBDF(buf, &devargs->pci.addr) != 0) {
-                       RTE_LOG(ERR, EAL,
-                               "invalid PCI identifier <%s>\n", buf);
-                       free(devargs);
-                       return -1;
-               }
+                   eal_parse_pci_DomBDF(buf, &devargs->pci.addr) != 0)
+                       goto fail;
+
                break;
        case RTE_DEVTYPE_VIRTUAL:
                /* save driver name */
-               ret = snprintf(devargs->virtual.drv_name,
-                       sizeof(devargs->virtual.drv_name), "%s", buf);
-               if (ret < 0 || ret >= (int)sizeof(devargs->virtual.drv_name)) {
-                       RTE_LOG(ERR, EAL,
-                               "driver name too large: <%s>\n", buf);
-                       free(devargs);
-                       return -1;
-               }
+               ret = snprintf(devargs->virt.drv_name,
+                              sizeof(devargs->virt.drv_name), "%s", buf);
+               if (ret < 0 || ret >= (int)sizeof(devargs->virt.drv_name))
+                       goto fail;
+
                break;
        }
 
+       free(buf);
        TAILQ_INSERT_TAIL(&devargs_list, devargs, next);
        return 0;
+
+fail:
+       free(buf);
+       if (devargs) {
+               free(devargs->args);
+               free(devargs);
+       }
+
+       return -1;
 }
 
 /* count the number of devices of a specified type */
@@ -144,7 +168,7 @@ rte_eal_devargs_dump(FILE *f)
                               devargs->args);
                else if (devargs->type == RTE_DEVTYPE_VIRTUAL)
                        fprintf(f, "  VIRTUAL %s %s\n",
-                              devargs->virtual.drv_name,
+                              devargs->virt.drv_name,
                               devargs->args);
                else
                        fprintf(f, "  UNKNOWN %s\n", devargs->args);