New upstream version 18.11-rc3

[deb_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 dac2402..1ccf12d 100644 (file)
--- a/lib/librte_eal/common/eal_common_devargs.c
+++ b/lib/librte_eal/common/eal_common_devargs.c
@@ -4,9 +4,6 @@
 
 /* This file manages the list of devices and their arguments, as given
  * by the user at startup
- *
- * Code here should not call rte_log since the EAL environment
- * may not be initialized.
  */
 
 #include <stdio.h>
@@ -28,39 +25,9 @@
 TAILQ_HEAD(rte_devargs_list, rte_devargs);
 
 /** Global list of user devices */
-struct rte_devargs_list devargs_list =
+static struct rte_devargs_list devargs_list =
        TAILQ_HEAD_INITIALIZER(devargs_list);
 
-int
-rte_eal_parse_devargs_str(const char *devargs_str,
-                       char **drvname, char **drvargs)
-{
-       char *sep;
-
-       if ((devargs_str) == NULL || (drvname) == NULL || (drvargs == NULL))
-               return -1;
-
-       *drvname = strdup(devargs_str);
-       if (*drvname == NULL)
-               return -1;
-
-       /* set the first ',' to '\0' to split name and arguments */
-       sep = strchr(*drvname, ',');
-       if (sep != NULL) {
-               sep[0] = '\0';
-               *drvargs = strdup(sep + 1);
-       } else {
-               *drvargs = strdup("");
-       }
-
-       if (*drvargs == NULL) {
-               free(*drvname);
-               *drvname = NULL;
-               return -1;
-       }
-       return 0;
-}
-
 static size_t
 devargs_layer_count(const char *s)
 {
@@ -270,6 +237,7 @@ rte_devargs_parsef(struct rte_devargs *da, const char *format, ...)
        va_list ap;
        size_t len;
        char *dev;
+       int ret;
 
        if (da == NULL)
                return -EINVAL;
@@ -288,18 +256,45 @@ rte_devargs_parsef(struct rte_devargs *da, const char *format, ...)
        vsnprintf(dev, len + 1, format, ap);
        va_end(ap);
 
-       return rte_devargs_parse(da, dev);
+       ret = rte_devargs_parse(da, dev);
+
+       free(dev);
+       return ret;
 }
 
 int __rte_experimental
-rte_devargs_insert(struct rte_devargs *da)
+rte_devargs_insert(struct rte_devargs **da)
 {
-       int ret;
+       struct rte_devargs *listed_da;
+       void *tmp;
+
+       if (*da == NULL || (*da)->bus == NULL)
+               return -1;
 
-       ret = rte_devargs_remove(da->bus->name, da->name);
-       if (ret < 0)
-               return ret;
-       TAILQ_INSERT_TAIL(&devargs_list, da, next);
+       TAILQ_FOREACH_SAFE(listed_da, &devargs_list, next, tmp) {
+               if (listed_da == *da)
+                       /* devargs already in the list */
+                       return 0;
+               if (strcmp(listed_da->bus->name, (*da)->bus->name) == 0 &&
+                               strcmp(listed_da->name, (*da)->name) == 0) {
+                       /* device already in devargs list, must be updated */
+                       listed_da->type = (*da)->type;
+                       listed_da->policy = (*da)->policy;
+                       free(listed_da->args);
+                       listed_da->args = (*da)->args;
+                       listed_da->bus = (*da)->bus;
+                       listed_da->cls = (*da)->cls;
+                       listed_da->bus_str = (*da)->bus_str;
+                       listed_da->cls_str = (*da)->cls_str;
+                       listed_da->data = (*da)->data;
+                       /* replace provided devargs with found one */
+                       free(*da);
+                       *da = listed_da;
+                       return 0;
+               }
+       }
+       /* new device in the list */
+       TAILQ_INSERT_TAIL(&devargs_list, *da, next);
        return 0;
 }
 
@@ -342,14 +337,17 @@ fail:
 }
 
 int __rte_experimental
-rte_devargs_remove(const char *busname, const char *devname)
+rte_devargs_remove(struct rte_devargs *devargs)
 {
        struct rte_devargs *d;
        void *tmp;
 
+       if (devargs == NULL || devargs->bus == NULL)
+               return -1;
+
        TAILQ_FOREACH_SAFE(d, &devargs_list, next, tmp) {
-               if (strcmp(d->bus->name, busname) == 0 &&
-                   strcmp(d->name, devname) == 0) {
+               if (strcmp(d->bus->name, devargs->bus->name) == 0 &&
+                   strcmp(d->name, devargs->name) == 0) {
                        TAILQ_REMOVE(&devargs_list, d, next);
                        free(d->args);
                        free(d);