From: Gaetan Rivet <gaetan.rivet@6wind.com>
To: dev@dpdk.org
Cc: Gaetan Rivet <gaetan.rivet@6wind.com>
Subject: [dpdk-dev] [PATCH v3 2/3] dev: remove vdev function dependency
Date: Thu, 8 Jun 2017 01:58:29 +0200 [thread overview]
Message-ID: <aba9df09efaa3a92e2c3fa0ec3dcf485e3ebbdff.1496876926.git.gaetan.rivet@6wind.com> (raw)
In-Reply-To: <cover.1496876926.git.gaetan.rivet@6wind.com>
In-Reply-To: <cover.1496876926.git.gaetan.rivet@6wind.com>
Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
---
lib/librte_eal/common/eal_common_dev.c | 50 ++++++++++++++++++++--------------
1 file changed, 30 insertions(+), 20 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c
index 8ef9b98..247c9c1 100644
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -43,6 +43,7 @@
#include <rte_debug.h>
#include <rte_devargs.h>
#include <rte_log.h>
+#include <rte_errno.h>
#include "eal_private.h"
@@ -61,6 +62,8 @@ static int cmp_detached_dev_name(const struct rte_device *dev,
int rte_eal_dev_attach(const char *name, const char *devargs)
{
struct rte_device *dev;
+ struct rte_bus *bus;
+ struct rte_devargs da;
int ret;
if (name == NULL || devargs == NULL) {
@@ -70,30 +73,37 @@ int rte_eal_dev_attach(const char *name, const char *devargs)
dev = rte_bus_find_device(NULL, cmp_detached_dev_name, name);
if (dev) {
- struct rte_bus *bus;
-
bus = rte_bus_find_by_device(dev);
- if (!bus) {
- RTE_LOG(ERR, EAL, "Cannot find bus for device (%s)\n",
+ } else {
+ char da_str[snprintf(NULL, 0, "%s,%s", name, devargs) + 1];
+
+ /*
+ * If we haven't found a bus device the user meant to hotplug
+ * a device instead.
+ */
+ snprintf(da_str, sizeof(da_str), "%s,%s", name, devargs);
+ ret = rte_eal_devargs_parse(da_str, &da);
+ if (ret) {
+ RTE_LOG(ERR, EAL, "Could not parse device (%s)\n",
name);
- return -EINVAL;
- }
-
- if (!bus->plug) {
- RTE_LOG(ERR, EAL, "Bus function not supported\n");
- return -ENOTSUP;
+ return ret;
}
-
- ret = (bus->plug(dev->devargs) == NULL);
- goto out;
+ bus = da.bus;
}
-
- /*
- * If we haven't found a bus device the user meant to "hotplug" a
- * virtual device instead.
- */
- ret = rte_vdev_init(name, devargs);
-out:
+ if (bus == NULL) {
+ RTE_LOG(ERR, EAL, "Cannot find bus for device (%s)\n",
+ name);
+ return -EINVAL;
+ }
+ if (bus->plug == NULL) {
+ RTE_LOG(ERR, EAL, "Device hotplug not supported on this bus\n");
+ return -ENOTSUP;
+ }
+ if (dev == NULL)
+ dev = bus->plug(&da);
+ else
+ dev = bus->plug(dev->devargs);
+ ret = dev ? 0 : -rte_errno;
if (ret)
RTE_LOG(ERR, EAL, "Driver cannot attach the device (%s)\n",
name);
--
2.1.4
next prev parent reply other threads:[~2017-06-07 23:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-24 15:18 [dpdk-dev] [PATCH 0/3] eal: complete attach / detach support Gaetan Rivet
2017-05-24 15:18 ` [dpdk-dev] [PATCH 1/3] pci: implement attach/detach bus operation Gaetan Rivet
2017-05-24 15:18 ` [dpdk-dev] [PATCH 2/3] vdev: implement attach " Gaetan Rivet
2017-05-24 15:18 ` [dpdk-dev] [PATCH 3/3] vdev: use standard bus registration function Gaetan Rivet
2017-06-01 10:11 ` [dpdk-dev] [PATCH v2 0/3] eal: complete attach / detach support Gaetan Rivet
2017-06-01 10:12 ` [dpdk-dev] [PATCH v2 1/3] pci: implement plug/unplug bus operation Gaetan Rivet
2017-06-01 10:12 ` [dpdk-dev] [PATCH v2 2/3] dev: remove vdev function dependency Gaetan Rivet
2017-06-01 10:12 ` [dpdk-dev] [PATCH v2 3/3] vdev: use standard bus registration function Gaetan Rivet
2017-06-07 23:58 ` [dpdk-dev] [PATCH v3 0/3] eal: complete attach / detach support Gaetan Rivet
2017-06-07 23:58 ` [dpdk-dev] [PATCH v3 1/3] pci: implement hotplug bus operation Gaetan Rivet
2017-06-07 23:58 ` Gaetan Rivet [this message]
2017-06-21 14:42 ` [dpdk-dev] [PATCH v3 2/3] dev: remove vdev function dependency Thomas Monjalon
2017-06-07 23:58 ` [dpdk-dev] [PATCH v3 3/3] vdev: use standard bus registration function Gaetan Rivet
2017-06-21 14:41 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aba9df09efaa3a92e2c3fa0ec3dcf485e3ebbdff.1496876926.git.gaetan.rivet@6wind.com \
--to=gaetan.rivet@6wind.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).