net/szedata2: remove unused macro

[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 0037a64..baf3c5b 100644 (file)
--- a/lib/librte_eal/common/eal_common_vdev.c
+++ b/lib/librte_eal/common/eal_common_vdev.c
@@ -35,14 +35,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
+#include <stdbool.h>
 #include <sys/queue.h>
 
 #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>
 
 /** Double linked list of virtual device drivers. */
 TAILQ_HEAD(vdev_device_list, rte_vdev_device);
@@ -52,14 +55,10 @@ static struct vdev_device_list vdev_device_list =
 struct vdev_driver_list vdev_driver_list =
        TAILQ_HEAD_INITIALIZER(vdev_driver_list);
 
-static void rte_vdev_bus_register(void);
-
 /* register a driver */
 void
 rte_vdev_register(struct rte_vdev_driver *driver)
 {
-       rte_vdev_bus_register();
-
        TAILQ_INSERT_TAIL(&vdev_driver_list, driver, next);
 }
 
@@ -338,21 +337,41 @@ vdev_probe(void)
        return 0;
 }
 
-static struct rte_bus rte_vdev_bus = {
-       .scan = vdev_scan,
-       .probe = vdev_probe,
-};
+static struct rte_device *
+vdev_find_device(const struct rte_device *start, rte_dev_cmp_t cmp,
+                const void *data)
+{
+       struct rte_vdev_device *dev;
+       bool start_found = !start;
 
-RTE_INIT(rte_vdev_bus_register);
+       TAILQ_FOREACH(dev, &vdev_device_list, next) {
+               if (start_found == 0) {
+                       if (&dev->device == start)
+                               start_found = 1;
+                       continue;
+               }
+               if (cmp(&dev->device, data) == 0)
+                       return &dev->device;
+       }
+       return NULL;
+}
 
-static void rte_vdev_bus_register(void)
+static int
+vdev_unplug(struct rte_device *dev)
 {
-       static int registered;
+       /*
+        * The virtual bus doesn't support 'unattached' devices so this is
+        * actually equal to hotplugging removal of it.
+        */
+       return rte_vdev_uninit(dev->name);
+}
 
-       if (registered)
-               return;
+static struct rte_bus rte_vdev_bus = {
+       .scan = vdev_scan,
+       .probe = vdev_probe,
+       .find_device = vdev_find_device,
+       /* .plug = NULL, see comment on vdev_unplug */
+       .unplug = vdev_unplug,
+};
 
-       registered = 1;
-       rte_vdev_bus.name = RTE_STR(virtual);
-       rte_bus_register(&rte_vdev_bus);
-}
+RTE_REGISTER_BUS(VIRTUAL_BUS_NAME, rte_vdev_bus);