devargs: promote experimental API as stable

[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 a22a200..2123773 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)
 {
@@ -118,12 +85,17 @@ rte_devargs_layers_parse(struct rte_devargs *devargs,
        }
 
        while (s != NULL) {
-               if (strncmp(layers[i].key, s,
-                           strlen(layers[i].key)) &&
-                   /* The last layer is free-form.
-                    * The "driver" key is not required (but accepted).
-                    */
-                   i != RTE_DIM(layers) - 1)
+               if (i >= RTE_DIM(layers)) {
+                       RTE_LOG(ERR, EAL, "Unrecognized layer %s\n", s);
+                       ret = -EINVAL;
+                       goto get_out;
+               }
+               /*
+                * The last layer is free-form.
+                * The "driver" key is not required (but accepted).
+                */
+               if (strncmp(layers[i].key, s, strlen(layers[i].key)) &&
+                               i != RTE_DIM(layers) - 1)
                        goto next_layer;
                layers[i].str = s;
                layers[i].kvlist = rte_kvargs_parse_delim(s, NULL, "/");
@@ -136,11 +108,6 @@ rte_devargs_layers_parse(struct rte_devargs *devargs,
                if (s != NULL)
                        s++;
 next_layer:
-               if (i >= RTE_DIM(layers)) {
-                       RTE_LOG(ERR, EAL, "Unrecognized layer %s\n", s);
-                       ret = -EINVAL;
-                       goto get_out;
-               }
                i++;
        }
 
@@ -207,7 +174,6 @@ bus_name_cmp(const struct rte_bus *bus, const void *name)
        return strncmp(bus->name, name, strlen(bus->name));
 }
 
-__rte_experimental
 int
 rte_devargs_parse(struct rte_devargs *da, const char *dev)
 {
@@ -263,13 +229,13 @@ rte_devargs_parse(struct rte_devargs *da, const char *dev)
        return 0;
 }
 
-__rte_experimental
 int
 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;
@@ -285,26 +251,52 @@ rte_devargs_parsef(struct rte_devargs *da, const char *format, ...)
        }
 
        va_start(ap, format);
-       vsnprintf(dev, len, format, ap);
+       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)
+int
+rte_devargs_insert(struct rte_devargs **da)
 {
-       int ret;
+       struct rte_devargs *listed_da;
+       void *tmp;
 
-       ret = rte_devargs_remove(da->bus->name, da->name);
-       if (ret < 0)
-               return ret;
-       TAILQ_INSERT_TAIL(&devargs_list, da, next);
+       if (*da == NULL || (*da)->bus == NULL)
+               return -1;
+
+       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;
 }
 
 /* store a whitelist parameter for later parsing */
-__rte_experimental
 int
 rte_devargs_add(enum rte_devtype devtype, const char *devargs_str)
 {
@@ -341,15 +333,18 @@ fail:
        return -1;
 }
 
-int __rte_experimental
-rte_devargs_remove(const char *busname, const char *devname)
+int
+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);
@@ -360,7 +355,6 @@ rte_devargs_remove(const char *busname, const char *devname)
 }
 
 /* count the number of devices of a specified type */
-__rte_experimental
 unsigned int
 rte_devargs_type_count(enum rte_devtype devtype)
 {
@@ -376,7 +370,6 @@ rte_devargs_type_count(enum rte_devtype devtype)
 }
 
 /* dump the user devices on the console */
-__rte_experimental
 void
 rte_devargs_dump(FILE *f)
 {
@@ -391,7 +384,6 @@ rte_devargs_dump(FILE *f)
 }
 
 /* bus-aware rte_devargs iterator. */
-__rte_experimental
 struct rte_devargs *
 rte_devargs_next(const char *busname, const struct rte_devargs *start)
 {