eal: use SPDX tags in 6WIND copyrighted files

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

diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c
index f98302d..cd07144 100644 (file)
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -1,35 +1,6 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *   Copyright(c) 2014 6WIND S.A.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation.
+ * Copyright(c) 2014 6WIND S.A.
  */
 
 #include <stdio.h>
@@ -37,6 +8,7 @@
 #include <inttypes.h>
 #include <sys/queue.h>
 
+#include <rte_compat.h>
 #include <rte_bus.h>
 #include <rte_dev.h>
 #include <rte_devargs.h>
@@ -67,7 +39,6 @@ static int cmp_dev_name(const struct rte_device *dev, const void *_name)
 int rte_eal_dev_attach(const char *name, const char *devargs)
 {
        struct rte_bus *bus;
-       int ret;
 
        if (name == NULL || devargs == NULL) {
                RTE_LOG(ERR, EAL, "Invalid device or arguments provided\n");
@@ -80,22 +51,13 @@ int rte_eal_dev_attach(const char *name, const char *devargs)
                        name);
                return -EINVAL;
        }
-       if (strcmp(bus->name, "pci") == 0)
-               return rte_eal_hotplug_add("pci", name, devargs);
-       if (strcmp(bus->name, "vdev") != 0) {
-               RTE_LOG(ERR, EAL, "Device attach is only supported for PCI and vdev devices.\n");
-               return -ENOTSUP;
-       }
+       if (strcmp(bus->name, "pci") == 0 || strcmp(bus->name, "vdev") == 0)
+               return rte_eal_hotplug_add(bus->name, name, devargs);
 
-       /*
-        * If we haven't found a bus device the user meant to "hotplug" a
-        * virtual device instead.
-        */
-       ret = rte_vdev_init(name, devargs);
-       if (ret)
-               RTE_LOG(ERR, EAL, "Driver cannot attach the device (%s)\n",
-                       name);
-       return ret;
+       RTE_LOG(ERR, EAL,
+               "Device attach is only supported for PCI and vdev devices.\n");
+
+       return -ENOTSUP;
 }
 
 int rte_eal_dev_detach(struct rte_device *dev)
@@ -133,20 +95,17 @@ full_dev_name(const char *bus, const char *dev, const char *args)
        char *name;
        size_t len;
 
-       len = strlen(bus) + 1 +
-             strlen(dev) + 1 +
-             strlen(args) + 1;
+       len = snprintf(NULL, 0, "%s:%s,%s", bus, dev, args) + 1;
        name = calloc(1, len);
        if (name == NULL) {
                RTE_LOG(ERR, EAL, "Could not allocate full device name\n");
                return NULL;
        }
-       snprintf(name, len, "%s:%s,%s", bus, dev,
-                args ? args : "");
+       snprintf(name, len, "%s:%s,%s", bus, dev, args);
        return name;
 }
 
-int rte_eal_hotplug_add(const char *busname, const char *devname,
+int __rte_experimental rte_eal_hotplug_add(const char *busname, const char *devname,
                        const char *devargs)
 {
        struct rte_bus *bus;
@@ -207,13 +166,17 @@ int rte_eal_hotplug_add(const char *busname, const char *devname,
        return 0;
 
 err_devarg:
-       rte_eal_devargs_remove(busname, devname);
+       if (rte_eal_devargs_remove(busname, devname)) {
+               free(da->args);
+               free(da);
+       }
 err_name:
        free(name);
        return ret;
 }
 
-int rte_eal_hotplug_remove(const char *busname, const char *devname)
+int __rte_experimental
+rte_eal_hotplug_remove(const char *busname, const char *devname)
 {
        struct rte_bus *bus;
        struct rte_device *dev;