d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vdev: remove eal prefix

Browse Source 
The VDEV code will move to the bus drivers directory.
Rename functions from rte_eal_vdev_ to rte_vdev_
to prepare the move of the driver out of EAL.

The prefix rte_eal_vdrv_ is also renamed to rte_vdev_.
It was used for registration of vdev drivers.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Thomas Monjalon 2017-05-04 18:01:19 +02:00
parent 3dcfe0390c
commit 2f6fec5390
24 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/guides/cryptodevs/aesni_gcm.rst
View File

@ -67,9 +67,9 @@ In order to enable this virtual crypto PMD, user must:
To use the PMD in an application, user must:
* Call rte_eal_vdev_init("crypto_aesni_gcm") within the application.
* Call rte_vdev_init("crypto_aesni_gcm") within the application.
* Use --vdev="crypto_aesni_gcm" in the EAL options, which will call rte_eal_vdev_init() internally.
* Use --vdev="crypto_aesni_gcm" in the EAL options, which will call rte_vdev_init() internally.
The following parameters (all optional) can be provided in the previous two calls:

4
doc/guides/cryptodevs/aesni_mb.rst
View File

@ -113,9 +113,9 @@ In order to enable this virtual crypto PMD, user must:
To use the PMD in an application, user must:
* Call rte_eal_vdev_init("crypto_aesni_mb") within the application.
* Call rte_vdev_init("crypto_aesni_mb") within the application.
* Use --vdev="crypto_aesni_mb" in the EAL options, which will call rte_eal_vdev_init() internally.
* Use --vdev="crypto_aesni_mb" in the EAL options, which will call rte_vdev_init() internally.
The following parameters (all optional) can be provided in the previous two calls:

4
doc/guides/cryptodevs/kasumi.rst
View File

@ -90,9 +90,9 @@ In order to enable this virtual crypto PMD, user must:
To use the PMD in an application, user must:
* Call rte_eal_vdev_init("crypto_kasumi") within the application.
* Call rte_vdev_init("crypto_kasumi") within the application.
* Use --vdev="crypto_kasumi" in the EAL options, which will call rte_eal_vdev_init() internally.
* Use --vdev="crypto_kasumi" in the EAL options, which will call rte_vdev_init() internally.
The following parameters (all optional) can be provided in the previous two calls:

4
doc/guides/cryptodevs/null.rst
View File

@ -76,9 +76,9 @@ Initialization
To use the PMD in an application, user must:
* Call rte_eal_vdev_init("crypto_null") within the application.
* Call rte_vdev_init("crypto_null") within the application.
* Use --vdev="crypto_null" in the EAL options, which will call rte_eal_vdev_init() internally.
* Use --vdev="crypto_null" in the EAL options, which will call rte_vdev_init() internally.
The following parameters (all optional) can be provided in the previous two calls:

4
doc/guides/cryptodevs/scheduler.rst
View File

@ -72,10 +72,10 @@ Initialization
To use the PMD in an application, user must:
* Call rte_eal_vdev_init("crpyto_scheduler") within the application.
* Call rte_vdev_init("crpyto_scheduler") within the application.
* Use --vdev="crpyto_scheduler" in the EAL options, which will call
rte_eal_vdev_init() internally.
rte_vdev_init() internally.
The following parameters (all optional) can be provided in the previous

4
doc/guides/cryptodevs/snow3g.rst
View File

@ -83,9 +83,9 @@ In order to enable this virtual crypto PMD, user must:
To use the PMD in an application, user must:
* Call rte_eal_vdev_init("crypto_snow3g") within the application.
* Call rte_vdev_init("crypto_snow3g") within the application.
* Use --vdev="crypto_snow3g" in the EAL options, which will call rte_eal_vdev_init() internally.
* Use --vdev="crypto_snow3g" in the EAL options, which will call rte_vdev_init() internally.
The following parameters (all optional) can be provided in the previous two calls:

4
doc/guides/cryptodevs/zuc.rst
View File

@ -91,9 +91,9 @@ In order to enable this virtual crypto PMD, user must:
To use the PMD in an application, user must:
* Call rte_eal_vdev_init("crypto_zuc") within the application.
* Call rte_vdev_init("crypto_zuc") within the application.
* Use --vdev="crypto_zuc" in the EAL options, which will call rte_eal_vdev_init() internally.
* Use --vdev="crypto_zuc" in the EAL options, which will call rte_vdev_init() internally.
The following parameters (all optional) can be provided in the previous two calls:

4
doc/guides/eventdevs/octeontx.rst
View File

@ -129,10 +129,10 @@ SSO PCIe VF devices will be probed and then the vdev device can be created
from the application code, or from the EAL command line based on
the number of probed/bound SSO PCIe VF device to DPDK by
* Invoking ``rte_eal_vdev_init("event_octeontx")`` from the application
* Invoking ``rte_vdev_init("event_octeontx")`` from the application
* Using ``--vdev="event_octeontx"`` in the EAL options, which will call
rte_eal_vdev_init() internally
rte_vdev_init() internally
Example:

4
doc/guides/eventdevs/sw.rst
View File

@ -60,10 +60,10 @@ Configuration and Options
The software eventdev is a vdev device, and as such can be created from the
application code, or from the EAL command line:
* Call ``rte_eal_vdev_init("event_sw0")`` from the application
* Call ``rte_vdev_init("event_sw0")`` from the application
* Use ``--vdev="event_sw0"`` in the EAL options, which will call
rte_eal_vdev_init() internally
rte_vdev_init() internally
Example:

4
doc/guides/prog_guide/cryptodev_lib.rst
View File

@ -70,11 +70,11 @@ From the command line using the --vdev EAL option
--vdev 'cryptodev_aesni_mb_pmd0,max_nb_queue_pairs=2,max_nb_sessions=1024,socket_id=0'
Our using the rte_eal_vdev_init API within the application code.
Our using the rte_vdev_init API within the application code.
.. code-block:: c
rte_eal_vdev_init("cryptodev_aesni_mb_pmd",
rte_vdev_init("cryptodev_aesni_mb_pmd",
"max_nb_queue_pairs=2,max_nb_sessions=1024,socket_id=0")
All virtual Crypto devices support the following initialization parameters:

4
drivers/net/bonding/rte_eth_bond_api.c
View File

@ -177,7 +177,7 @@ rte_eth_bond_create(const char *name, uint8_t mode, uint8_t socket_id)
if (ret < 0 || ret >= (int)sizeof(devargs))
return -ENOMEM;
ret = rte_eal_vdev_init(name, devargs);
ret = rte_vdev_init(name, devargs);
if (ret)
return -ENOMEM;
@ -200,7 +200,7 @@ rte_eth_bond_create(const char *name, uint8_t mode, uint8_t socket_id)
int
rte_eth_bond_free(const char *name)
{
return rte_eal_vdev_uninit(name);
return rte_vdev_uninit(name);
}
static int

2
lib/librte_cryptodev/rte_cryptodev.c
View File

@ -439,7 +439,7 @@ rte_cryptodev_get_feature_name(uint64_t flag)
int
rte_cryptodev_create_vdev(const char *name, const char *args)
{
return rte_eal_vdev_init(name, args);
return rte_vdev_init(name, args);
}
struct rte_cryptodev *

8
lib/librte_eal/bsdapp/eal/rte_eal_version.map
View File

@ -39,8 +39,6 @@ DPDK_2.0 {
rte_eal_remote_launch;
rte_eal_tailq_lookup;
rte_eal_tailq_register;
rte_eal_vdev_init;
rte_eal_vdev_uninit;
rte_eal_wait_lcore;
rte_exit;
rte_free;
@ -147,8 +145,6 @@ DPDK_16.11 {
rte_delay_us_callback_register;
rte_eal_dev_attach;
rte_eal_dev_detach;
rte_eal_vdrv_register;
rte_eal_vdrv_unregister;
} DPDK_16.07;
@ -188,6 +184,10 @@ DPDK_17.05 {
rte_pci_unmap_device;
rte_pci_unregister;
rte_pci_write_config;
rte_vdev_init;
rte_vdev_register;
rte_vdev_uninit;
rte_vdev_unregister;
vfio_get_container_fd;
vfio_get_group_fd;
vfio_get_group_no;

4
lib/librte_eal/common/eal_common_dev.c
View File

@ -59,7 +59,7 @@ int rte_eal_dev_attach(const char *name, const char *devargs)
goto err;
} else {
if (rte_eal_vdev_init(name, devargs))
if (rte_vdev_init(name, devargs))
goto err;
}
@ -83,7 +83,7 @@ int rte_eal_dev_detach(const char *name)
if (rte_pci_detach(&addr) < 0)
goto err;
} else {
if (rte_eal_vdev_uninit(name))
if (rte_vdev_uninit(name))
goto err;
}
return 0;

8
lib/librte_eal/common/eal_common_vdev.c
View File

@ -56,7 +56,7 @@ static void rte_vdev_bus_register(void);
/* register a driver */
void
rte_eal_vdrv_register(struct rte_vdev_driver *driver)
rte_vdev_register(struct rte_vdev_driver *driver)
{
rte_vdev_bus_register();
@ -65,7 +65,7 @@ rte_eal_vdrv_register(struct rte_vdev_driver *driver)
/* unregister a driver */
void
rte_eal_vdrv_unregister(struct rte_vdev_driver *driver)
rte_vdev_unregister(struct rte_vdev_driver *driver)
{
TAILQ_REMOVE(&vdev_driver_list, driver, next);
}
@ -194,7 +194,7 @@ alloc_devargs(const char *name, const char *args)
}
int
rte_eal_vdev_init(const char *name, const char *args)
rte_vdev_init(const char *name, const char *args)
{
struct rte_vdev_device *dev;
struct rte_devargs *devargs;
@ -257,7 +257,7 @@ vdev_remove_driver(struct rte_vdev_device *dev)
}
int
rte_eal_vdev_uninit(const char *name)
rte_vdev_uninit(const char *name)
{
struct rte_vdev_device *dev;
struct rte_devargs *devargs;

4
lib/librte_eal/common/include/rte_dev.h
View File

@ -153,7 +153,7 @@ struct rte_device {
* @return
* 0 on success, negative on error
*/
int rte_eal_vdev_init(const char *name, const char *args);
int rte_vdev_init(const char *name, const char *args);
/**
* Uninitalize a driver specified by name.
@ -163,7 +163,7 @@ int rte_eal_vdev_init(const char *name, const char *args);
* @return
* 0 on success, negative on error
*/
int rte_eal_vdev_uninit(const char *name);
int rte_vdev_uninit(const char *name);
/**
* Attach a device to a registered driver.

6
lib/librte_eal/common/include/rte_vdev.h
View File

@ -92,7 +92,7 @@ struct rte_vdev_driver {
* A pointer to a rte_vdev_driver structure describing the driver
* to be registered.
*/
void rte_eal_vdrv_register(struct rte_vdev_driver *driver);
void rte_vdev_register(struct rte_vdev_driver *driver);
/**
* Unregister a virtual device driver.
@ -101,7 +101,7 @@ void rte_eal_vdrv_register(struct rte_vdev_driver *driver);
* A pointer to a rte_vdev_driver structure describing the driver
* to be unregistered.
*/
void rte_eal_vdrv_unregister(struct rte_vdev_driver *driver);
void rte_vdev_unregister(struct rte_vdev_driver *driver);
#define RTE_PMD_REGISTER_VDEV(nm, vdrv)\
RTE_INIT(vdrvinitfn_ ##vdrv);\
@ -110,7 +110,7 @@ static void vdrvinitfn_ ##vdrv(void)\
{\
(vdrv).driver.name = RTE_STR(nm);\
(vdrv).driver.alias = vdrvinit_ ## nm ## _alias;\
rte_eal_vdrv_register(&vdrv);\
rte_vdev_register(&vdrv);\
} \
RTE_PMD_EXPORT_NAME(nm, __COUNTER__)

8
lib/librte_eal/linuxapp/eal/rte_eal_version.map
View File

@ -39,8 +39,6 @@ DPDK_2.0 {
rte_eal_remote_launch;
rte_eal_tailq_lookup;
rte_eal_tailq_register;
rte_eal_vdev_init;
rte_eal_vdev_uninit;
rte_eal_wait_lcore;
rte_exit;
rte_free;
@ -151,8 +149,6 @@ DPDK_16.11 {
rte_delay_us_callback_register;
rte_eal_dev_attach;
rte_eal_dev_detach;
rte_eal_vdrv_register;
rte_eal_vdrv_unregister;
} DPDK_16.07;
@ -193,6 +189,10 @@ DPDK_17.05 {
rte_pci_unmap_device;
rte_pci_unregister;
rte_pci_write_config;
rte_vdev_init;
rte_vdev_register;
rte_vdev_uninit;
rte_vdev_unregister;
vfio_get_container_fd;
vfio_get_group_fd;
vfio_get_group_no;

20
test/test/test_cryptodev.c
View File

@ -219,7 +219,7 @@ testsuite_setup(void)
nb_devs = rte_cryptodev_count_devtype(
RTE_CRYPTODEV_AESNI_MB_PMD);
if (nb_devs < 1) {
ret = rte_eal_vdev_init(
ret = rte_vdev_init(
RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD), NULL);
TEST_ASSERT(ret == 0,
@ -239,7 +239,7 @@ testsuite_setup(void)
nb_devs = rte_cryptodev_count_devtype(
RTE_CRYPTODEV_AESNI_GCM_PMD);
if (nb_devs < 1) {
TEST_ASSERT_SUCCESS(rte_eal_vdev_init(
TEST_ASSERT_SUCCESS(rte_vdev_init(
RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD), NULL),
"Failed to create instance of"
" pmd : %s",
@ -256,7 +256,7 @@ testsuite_setup(void)
#endif
nb_devs = rte_cryptodev_count_devtype(RTE_CRYPTODEV_SNOW3G_PMD);
if (nb_devs < 1) {
TEST_ASSERT_SUCCESS(rte_eal_vdev_init(
TEST_ASSERT_SUCCESS(rte_vdev_init(
RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD), NULL),
"Failed to create instance of"
" pmd : %s",
@ -273,7 +273,7 @@ testsuite_setup(void)
#endif
nb_devs = rte_cryptodev_count_devtype(RTE_CRYPTODEV_KASUMI_PMD);
if (nb_devs < 1) {
TEST_ASSERT_SUCCESS(rte_eal_vdev_init(
TEST_ASSERT_SUCCESS(rte_vdev_init(
RTE_STR(CRYPTODEV_NAME_KASUMI_PMD), NULL),
"Failed to create instance of"
" pmd : %s",
@ -290,7 +290,7 @@ testsuite_setup(void)
#endif
nb_devs = rte_cryptodev_count_devtype(RTE_CRYPTODEV_ZUC_PMD);
if (nb_devs < 1) {
TEST_ASSERT_SUCCESS(rte_eal_vdev_init(
TEST_ASSERT_SUCCESS(rte_vdev_init(
RTE_STR(CRYPTODEV_NAME_ZUC_PMD), NULL),
"Failed to create instance of"
" pmd : %s",
@ -308,7 +308,7 @@ testsuite_setup(void)
nb_devs = rte_cryptodev_count_devtype(
RTE_CRYPTODEV_NULL_PMD);
if (nb_devs < 1) {
ret = rte_eal_vdev_init(
ret = rte_vdev_init(
RTE_STR(CRYPTODEV_NAME_NULL_PMD), NULL);
TEST_ASSERT(ret == 0,
@ -328,7 +328,7 @@ testsuite_setup(void)
nb_devs = rte_cryptodev_count_devtype(
RTE_CRYPTODEV_OPENSSL_PMD);
if (nb_devs < 1) {
ret = rte_eal_vdev_init(
ret = rte_vdev_init(
RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD),
NULL);
@ -348,7 +348,7 @@ testsuite_setup(void)
nb_devs = rte_cryptodev_count_devtype(
RTE_CRYPTODEV_ARMV8_PMD);
if (nb_devs < 1) {
ret = rte_eal_vdev_init(
ret = rte_vdev_init(
RTE_STR(CRYPTODEV_NAME_ARMV8_PMD),
NULL);
@ -369,7 +369,7 @@ testsuite_setup(void)
nb_devs = rte_cryptodev_count_devtype(
RTE_CRYPTODEV_SCHEDULER_PMD);
if (nb_devs < 1) {
ret = rte_eal_vdev_init(
ret = rte_vdev_init(
RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD),
NULL);
@ -7825,7 +7825,7 @@ test_scheduler_attach_slave_op(void)
snprintf(vdev_name, sizeof(vdev_name), "%s_%u",
RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD),
i);
ret = rte_eal_vdev_init(vdev_name, NULL);
ret = rte_vdev_init(vdev_name, NULL);
TEST_ASSERT(ret == 0,
"Failed to create instance %u of"

10
test/test/test_cryptodev_perf.c
View File

@ -332,7 +332,7 @@ testsuite_setup(void)
#endif
nb_devs = rte_cryptodev_count_devtype(RTE_CRYPTODEV_AESNI_MB_PMD);
if (nb_devs < 1) {
ret = rte_eal_vdev_init(
ret = rte_vdev_init(
RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD), NULL);
TEST_ASSERT(ret == 0,
@ -350,7 +350,7 @@ testsuite_setup(void)
#endif
nb_devs = rte_cryptodev_count_devtype(RTE_CRYPTODEV_AESNI_GCM_PMD);
if (nb_devs < 1) {
ret = rte_eal_vdev_init(
ret = rte_vdev_init(
RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD), NULL);
TEST_ASSERT(ret == 0,
@ -368,7 +368,7 @@ testsuite_setup(void)
#endif
nb_devs = rte_cryptodev_count_devtype(RTE_CRYPTODEV_SNOW3G_PMD);
if (nb_devs < 1) {
ret = rte_eal_vdev_init(
ret = rte_vdev_init(
RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD), NULL);
TEST_ASSERT(ret == 0,
@ -387,7 +387,7 @@ testsuite_setup(void)
nb_devs = rte_cryptodev_count_devtype(
RTE_CRYPTODEV_OPENSSL_PMD);
if (nb_devs < 1) {
ret = rte_eal_vdev_init(
ret = rte_vdev_init(
RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD),
NULL);
@ -407,7 +407,7 @@ testsuite_setup(void)
nb_devs = rte_cryptodev_count_devtype(
RTE_CRYPTODEV_ARMV8_PMD);
if (nb_devs < 1) {
ret = rte_eal_vdev_init(
ret = rte_vdev_init(
RTE_STR(CRYPTODEV_NAME_ARMV8_PMD),
NULL);

2
test/test/test_eventdev.c
View File

@ -51,7 +51,7 @@ testsuite_setup(void)
if (!count) {
printf("Failed to find a valid event device,"
" testing with event_skeleton device\n");
return rte_eal_vdev_init("event_skeleton", NULL);
return rte_vdev_init("event_skeleton", NULL);
}
return TEST_SUCCESS;
}

2
test/test/test_eventdev_octeontx.c
View File

@ -115,7 +115,7 @@ testsuite_setup(void)
if (evdev < 0) {
printf("%d: Eventdev %s not found - creating.\n",
__LINE__, eventdev_name);
if (rte_eal_vdev_init(eventdev_name, NULL) < 0) {
if (rte_vdev_init(eventdev_name, NULL) < 0) {
printf("Error creating eventdev %s\n", eventdev_name);
return TEST_FAILED;
}

2
test/test/test_eventdev_sw.c
View File

@ -2999,7 +2999,7 @@ test_sw_eventdev(void)
if (evdev < 0) {
printf("%d: Eventdev %s not found - creating.\n",
__LINE__, eventdev_name);
if (rte_eal_vdev_init(eventdev_name, NULL) < 0) {
if (rte_vdev_init(eventdev_name, NULL) < 0) {
printf("Error creating eventdev\n");
return -1;
}

2
test/test/test_link_bonding_rssconf.c
View File

@ -550,7 +550,7 @@ test_setup(void)
port_id = rte_eth_dev_count();
snprintf(name, sizeof(name), SLAVE_DEV_NAME_FMT, port_id);
retval = rte_eal_vdev_init(name,
retval = rte_vdev_init(name,
"driver=net_null,size=64,copy=0");
TEST_ASSERT_SUCCESS(retval, "Failed to create null device '%s'\n",
name);