From 9fa5e2b026d18319be6fde18e08b6842937802a1 Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Fri, 11 Apr 2014 13:45:03 +0200 Subject: [PATCH] vdev: rename nonpci_devs as vdev The name "nonpci_devs" for virtual devices is ambiguous as a physical device can also be non-PCI (ex: usb, sata, ...). A better name for this file is "vdev" as it only deals with virtual devices. This patch doesn't introduce any change except renaming. Signed-off-by: Olivier Matz Acked-by: Thomas Monjalon --- lib/librte_eal/bsdapp/eal/Makefile | 2 +- lib/librte_eal/bsdapp/eal/eal.c | 4 ++-- .../common/{eal_common_nonpci_devs.c => eal_common_vdev.c} | 2 +- lib/librte_eal/common/include/eal_private.h | 4 ++-- lib/librte_eal/linuxapp/eal/Makefile | 2 +- lib/librte_eal/linuxapp/eal/eal.c | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) rename lib/librte_eal/common/{eal_common_nonpci_devs.c => eal_common_vdev.c} (98%) diff --git a/lib/librte_eal/bsdapp/eal/Makefile b/lib/librte_eal/bsdapp/eal/Makefile index 73facaeadc..4c2a4f1a46 100644 --- a/lib/librte_eal/bsdapp/eal/Makefile +++ b/lib/librte_eal/bsdapp/eal/Makefile @@ -69,7 +69,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_errno.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_cpuflags.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_hexdump.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_whitelist.c -SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_nonpci_devs.c +SRCS-$(CONFIG_RTE_LIBRTE_EAL_BSDAPP) += eal_common_vdev.c CFLAGS_eal.o := -D_GNU_SOURCE #CFLAGS_eal_thread.o := -D_GNU_SOURCE diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c index be00f9120a..e944abae04 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c @@ -854,8 +854,8 @@ rte_eal_init(int argc, char **argv) rte_eal_mcfg_complete(); - if (rte_eal_non_pci_ethdev_init() < 0) - rte_panic("Cannot init non-PCI eth_devs\n"); + if (rte_eal_vdev_init() < 0) + rte_panic("Cannot init virtual devices\n"); RTE_LCORE_FOREACH_SLAVE(i) { diff --git a/lib/librte_eal/common/eal_common_nonpci_devs.c b/lib/librte_eal/common/eal_common_vdev.c similarity index 98% rename from lib/librte_eal/common/eal_common_nonpci_devs.c rename to lib/librte_eal/common/eal_common_vdev.c index 71cbb1eaa4..02d3fd6b46 100644 --- a/lib/librte_eal/common/eal_common_nonpci_devs.c +++ b/lib/librte_eal/common/eal_common_vdev.c @@ -80,7 +80,7 @@ struct device_init dev_types[] = { }; int -rte_eal_non_pci_ethdev_init(void) +rte_eal_vdev_init(void) { struct rte_devargs *devargs; uint8_t i; diff --git a/lib/librte_eal/common/include/eal_private.h b/lib/librte_eal/common/include/eal_private.h index f9a019b460..22d8b084a4 100644 --- a/lib/librte_eal/common/include/eal_private.h +++ b/lib/librte_eal/common/include/eal_private.h @@ -197,10 +197,10 @@ int rte_eal_intr_init(void); int rte_eal_alarm_init(void); /** - * This function initialises any non-PCI i.e. dummy ethernet devices + * This function initialises any virtual devices * * This function is private to the EAL. */ -int rte_eal_non_pci_ethdev_init(void); +int rte_eal_vdev_init(void); #endif /* _EAL_PRIVATE_H_ */ diff --git a/lib/librte_eal/linuxapp/eal/Makefile b/lib/librte_eal/linuxapp/eal/Makefile index bdd940d34f..00f7367d23 100644 --- a/lib/librte_eal/linuxapp/eal/Makefile +++ b/lib/librte_eal/linuxapp/eal/Makefile @@ -77,7 +77,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_errno.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_cpuflags.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_hexdump.c SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_devargs.c -SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_nonpci_devs.c +SRCS-$(CONFIG_RTE_LIBRTE_EAL_LINUXAPP) += eal_common_vdev.c CFLAGS_eal.o := -D_GNU_SOURCE CFLAGS_eal_thread.o := -D_GNU_SOURCE diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c index 905ce37b33..c015a65807 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -1046,8 +1046,8 @@ rte_eal_init(int argc, char **argv) rte_eal_mcfg_complete(); - if (rte_eal_non_pci_ethdev_init() < 0) - rte_panic("Cannot init non-PCI eth_devs\n"); + if (rte_eal_vdev_init() < 0) + rte_panic("Cannot init virtual devices\n"); TAILQ_FOREACH(solib, &solib_list, next) { solib->lib_handle = dlopen(solib->name, RTLD_NOW); -- 2.20.1