eal: add driver name alias

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

diff --git a/lib/librte_eal/common/eal_common_vdev.c b/lib/librte_eal/common/eal_common_vdev.c
index 62d0302..0ff2377 100644 (file)
--- a/lib/librte_eal/common/eal_common_vdev.c
+++ b/lib/librte_eal/common/eal_common_vdev.c
@@ -1,24 +1,22 @@
 /*-
  *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *   Copyright(c) 2014 6WIND S.A.
- *   All rights reserved.
- * 
+ *
+ *   Copyright(c) 2016 RehiveTech. 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
+ *     * Neither the name of RehiveTech 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
@@ -34,64 +32,85 @@
 
 #include <string.h>
 #include <inttypes.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
 #include <sys/queue.h>
 
 #include <rte_vdev.h>
-#include <rte_devargs.h>
-#include <rte_debug.h>
-#include <rte_devargs.h>
+#include <rte_common.h>
 
-#include "eal_private.h"
-
-/** Global list of virtual device drivers. */
-static struct rte_vdev_driver_list vdev_driver_list =
+struct vdev_driver_list vdev_driver_list =
        TAILQ_HEAD_INITIALIZER(vdev_driver_list);
 
 /* register a driver */
 void
-rte_eal_vdev_driver_register(struct rte_vdev_driver *driver)
+rte_eal_vdrv_register(struct rte_vdev_driver *driver)
 {
        TAILQ_INSERT_TAIL(&vdev_driver_list, driver, next);
+       rte_eal_driver_register(&driver->driver);
 }
 
 /* unregister a driver */
 void
-rte_eal_vdev_driver_unregister(struct rte_vdev_driver *driver)
+rte_eal_vdrv_unregister(struct rte_vdev_driver *driver)
 {
+       rte_eal_driver_unregister(&driver->driver);
        TAILQ_REMOVE(&vdev_driver_list, driver, next);
 }
 
 int
-rte_eal_vdev_init(void)
+rte_eal_vdev_init(const char *name, const char *args)
 {
-       struct rte_devargs *devargs;
        struct rte_vdev_driver *driver;
 
-       /* No need to register drivers that are embeded in DPDK
-        * (pmd_pcap, pmd_ring, ...). The initialization function have
-        * the ((constructor)) attribute so they will register at
-        * startup. */
+       if (name == NULL)
+               return -EINVAL;
+
+       TAILQ_FOREACH(driver, &vdev_driver_list, next) {
+               /*
+                * search a driver prefix in virtual device name.
+                * For example, if the driver is pcap PMD, driver->name
+                * will be "net_pcap", but "name" will be "net_pcapN".
+                * So use strncmp to compare.
+                */
+               if (!strncmp(driver->driver.name, name,
+                           strlen(driver->driver.name)))
+                       return driver->probe(name, args);
+       }
+
+       /* Give new names precedence over aliases. */
+       TAILQ_FOREACH(driver, &vdev_driver_list, next) {
+               if (driver->driver.alias &&
+                   !strncmp(driver->driver.alias, name,
+                           strlen(driver->driver.alias)))
+                       return driver->probe(name, args);
+       }
 
-       /* call the init function for each virtual device */
-       TAILQ_FOREACH(devargs, &devargs_list, next) {
+       RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
+       return -EINVAL;
+}
 
-               if (devargs->type != RTE_DEVTYPE_VIRTUAL)
-                       continue;
+int
+rte_eal_vdev_uninit(const char *name)
+{
+       struct rte_vdev_driver *driver;
 
-               TAILQ_FOREACH(driver, &vdev_driver_list, next) {
-                       /* search a driver prefix in virtual device name */
-                       if (!strncmp(driver->name, devargs->virtual.drv_name,
-                                       strlen(driver->name))) {
-                               driver->init(devargs->virtual.drv_name,
-                                       devargs->args);
-                               break;
-                       }
-               }
+       if (name == NULL)
+               return -EINVAL;
 
-               if (driver == NULL) {
-                       rte_panic("no driver found for %s\n",
-                                 devargs->virtual.drv_name);
-               }
+       TAILQ_FOREACH(driver, &vdev_driver_list, next) {
+               /*
+                * search a driver prefix in virtual device name.
+                * For example, if the driver is pcap PMD, driver->name
+                * will be "net_pcap", but "name" will be "net_pcapN".
+                * So use strncmp to compare.
+                */
+               if (!strncmp(driver->driver.name, name,
+                            strlen(driver->driver.name)))
+                       return driver->remove(name);
        }
-       return 0;
+
+       RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
+       return -EINVAL;
 }