New upstream version 17.11-rc3

[deb_dpdk.git] / drivers / bus / vdev / vdev.c

diff --git a/lib/librte_eal/common/eal_common_vdev.c b/drivers/bus/vdev/vdev.c
similarity index 94%
rename from lib/librte_eal/common/eal_common_vdev.c
rename to drivers/bus/vdev/vdev.c
index f7e547a..fd7736d 100644 (file)
--- a/lib/librte_eal/common/eal_common_vdev.c
+++ b/drivers/bus/vdev/vdev.c
@@ -41,12 +41,16 @@
 #include <rte_eal.h>
 #include <rte_dev.h>
 #include <rte_bus.h>
-#include <rte_vdev.h>
 #include <rte_common.h>
 #include <rte_devargs.h>
 #include <rte_memory.h>
 #include <rte_errno.h>
 
+#include "rte_bus_vdev.h"
+#include "vdev_logs.h"
+
+int vdev_logtype_bus;
+
 /* Forward declare to access virtual bus name */
 static struct rte_bus rte_vdev_bus;
 
@@ -102,7 +106,7 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev)
 
        name = rte_vdev_device_name(dev);
 
-       RTE_LOG(DEBUG, EAL, "Search driver %s to probe device %s\n", name,
+       VDEV_LOG(DEBUG, "Search driver %s to probe device %s\n", name,
                rte_vdev_device_name(dev));
 
        if (vdev_parse(name, &driver))
@@ -124,6 +128,7 @@ find_vdev(const char *name)
 
        TAILQ_FOREACH(dev, &vdev_device_list, next) {
                const char *devname = rte_vdev_device_name(dev);
+
                if (!strncmp(devname, name, strlen(name)))
                        return dev;
        }
@@ -188,7 +193,7 @@ rte_vdev_init(const char *name, const char *args)
        ret = vdev_probe_all_drivers(dev);
        if (ret) {
                if (ret > 0)
-                       RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
+                       VDEV_LOG(ERR, "no driver found for %s\n", name);
                goto fail;
        }
 
@@ -211,7 +216,7 @@ vdev_remove_driver(struct rte_vdev_device *dev)
        const struct rte_vdev_driver *driver;
 
        if (!dev->device.driver) {
-               RTE_LOG(DEBUG, EAL, "no driver attach to device %s\n", name);
+               VDEV_LOG(DEBUG, "no driver attach to device %s\n", name);
                return 1;
        }
 
@@ -292,7 +297,7 @@ vdev_probe(void)
                        continue;
 
                if (vdev_probe_all_drivers(dev)) {
-                       RTE_LOG(ERR, EAL, "failed to initialize %s device\n",
+                       VDEV_LOG(ERR, "failed to initialize %s device\n",
                                rte_vdev_device_name(dev));
                        return -1;
                }
@@ -340,3 +345,10 @@ static struct rte_bus rte_vdev_bus = {
 };
 
 RTE_REGISTER_BUS(vdev, rte_vdev_bus);
+
+RTE_INIT(vdev_init_log)
+{
+       vdev_logtype_bus = rte_log_register("bus.vdev");
+       if (vdev_logtype_bus >= 0)
+               rte_log_set_level(vdev_logtype_bus, RTE_LOG_NOTICE);
+}