diff mbox

[dpdk-dev,1/2] drivers: add name alias registration for rte_driver

Message ID 1476956223-30308-1-git-send-email-jblunck@infradead.org (mailing list archive)
State Superseded, archived
Headers

Commit Message

Jan Blunck Oct. 20, 2016, 9:37 a.m. UTC 
  This adds infrastructure for drivers to allow being requested by an alias
so that a renamed driver can still get loaded by its legacy name.

Signed-off-by: Jan Blunck <jblunck@infradead.org>
---
 lib/librte_eal/common/eal_common_vdev.c  | 8 ++++++++
 lib/librte_eal/common/include/rte_dev.h  | 1 +
 lib/librte_eal/common/include/rte_vdev.h | 5 +++++
 3 files changed, 14 insertions(+)

Comments

De Lara Guarch, Pablo Oct. 21, 2016, 6:31 p.m. UTC | #1 
> -----Original Message-----
> From: Jan Blunck [mailto:jblunck@gmail.com] On Behalf Of Jan Blunck
> Sent: Thursday, October 20, 2016 2:37 AM
> To: dev@dpdk.org
> Cc: De Lara Guarch, Pablo; thomas.monjalon@6wind.com;
> yuanhan.liu@linux.intel.com; Mcnamara, John
> Subject: [PATCH 1/2] drivers: add name alias registration for rte_driver
> 
> This adds infrastructure for drivers to allow being requested by an alias
> so that a renamed driver can still get loaded by its legacy name.
> 
> Signed-off-by: Jan Blunck <jblunck@infradead.org>

Hi Jan,

I saw two checkpatch errors in this patch that should be fixed:

ERROR: "foo * bar" should be "foo *bar"
#55: FILE: lib/librte_eal/common/include/rte_vdev.h:86:
+static const char * vdrvinit_ ## nm ## _alias;\

ERROR: "foo * bar" should be "foo *bar"
#65: FILE: lib/librte_eal/common/include/rte_vdev.h:96:
+static const char * vdrvinit_ ## nm ## _alias = RTE_STR(alias)

total: 2 errors, 0 warnings, 39 lines checked

Thanks,
Pablo
Maxime Coquelin Oct. 22, 2016, 11:24 a.m. UTC | #2 
On 10/20/2016 11:37 AM, Jan Blunck wrote:
> This adds infrastructure for drivers to allow being requested by an alias
> so that a renamed driver can still get loaded by its legacy name.
>
> Signed-off-by: Jan Blunck <jblunck@infradead.org>
> ---
>  lib/librte_eal/common/eal_common_vdev.c  | 8 ++++++++
>  lib/librte_eal/common/include/rte_dev.h  | 1 +
>  lib/librte_eal/common/include/rte_vdev.h | 5 +++++
>  3 files changed, 14 insertions(+)

Hi Jan,
This looks good to me, once Pablo's comment is taken into account, feel
free to add my:
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

Thanks for doing the work!
Maxime
diff mbox

Patch

diff --git a/lib/librte_eal/common/eal_common_vdev.c b/lib/librte_eal/common/eal_common_vdev.c
index 8b05f50..0ff2377 100644
--- a/lib/librte_eal/common/eal_common_vdev.c
+++ b/lib/librte_eal/common/eal_common_vdev.c
@@ -79,6 +79,14 @@  rte_eal_vdev_init(const char *name, const char *args)
 			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);
+	}
+
 	RTE_LOG(ERR, EAL, "no driver found for %s\n", name);
 	return -EINVAL;
 }
diff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h
index b3873bd..8840380 100644
--- a/lib/librte_eal/common/include/rte_dev.h
+++ b/lib/librte_eal/common/include/rte_dev.h
@@ -149,6 +149,7 @@  void rte_eal_device_remove(struct rte_device *dev);
 struct rte_driver {
 	TAILQ_ENTRY(rte_driver) next;  /**< Next in list. */
 	const char *name;                   /**< Driver name. */
+	const char *alias;              /**< Driver alias. */
 };
 
 /**
diff --git a/lib/librte_eal/common/include/rte_vdev.h b/lib/librte_eal/common/include/rte_vdev.h
index 97260b2..ee5060e 100644
--- a/lib/librte_eal/common/include/rte_vdev.h
+++ b/lib/librte_eal/common/include/rte_vdev.h
@@ -83,13 +83,18 @@  void rte_eal_vdrv_unregister(struct rte_vdev_driver *driver);
 
 #define RTE_PMD_REGISTER_VDEV(nm, vdrv)\
 RTE_INIT(vdrvinitfn_ ##vdrv);\
+static const char * vdrvinit_ ## nm ## _alias;\
 static void vdrvinitfn_ ##vdrv(void)\
 {\
 	(vdrv).driver.name = RTE_STR(nm);\
+	(vdrv).driver.alias = vdrvinit_ ## nm ## _alias;\
 	rte_eal_vdrv_register(&vdrv);\
 } \
 RTE_PMD_EXPORT_NAME(nm, __COUNTER__)
 
+#define RTE_PMD_REGISTER_ALIAS(nm, alias)\
+static const char * vdrvinit_ ## nm ## _alias = RTE_STR(alias)
+
 #ifdef __cplusplus
 }
 #endif