From 4b614e9504a11322ca9225d697b87979c4e31c23 Mon Sep 17 00:00:00 2001 From: Xiao Wang Date: Wed, 13 Jun 2018 19:32:45 +0800 Subject: [PATCH] net/ifc: make driver name consistent Make the compiler switch name and document name consistent as ``ifc`` to avoid confusion. Also rename the map file to standard name for meson build in the process. Signed-off-by: Xiao Wang Signed-off-by: Bruce Richardson --- MAINTAINERS | 4 ++-- config/common_base | 4 ++-- config/common_linuxapp | 2 +- doc/guides/nics/{ifcvf.rst => ifc.rst} | 0 doc/guides/nics/index.rst | 2 +- drivers/net/Makefile | 2 +- drivers/net/ifc/Makefile | 8 ++++---- .../{rte_ifcvf_version.map => rte_pmd_ifc_version.map} | 0 mk/rte.app.mk | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) rename doc/guides/nics/{ifcvf.rst => ifc.rst} (100%) rename drivers/net/ifc/{rte_ifcvf_version.map => rte_pmd_ifc_version.map} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 14939f10a8..301daa8d3f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -564,8 +564,8 @@ Intel ifc M: Xiao Wang T: git://dpdk.org/next/dpdk-next-net-intel F: drivers/net/ifc/ -F: doc/guides/nics/ifcvf.rst -F: doc/guides/nics/features/ifcvf.ini +F: doc/guides/nics/ifc.rst +F: doc/guides/nics/features/ifc*.ini Marvell mvpp2 M: Tomasz Duszynski diff --git a/config/common_base b/config/common_base index 6b0d1cbbb7..fcf3a1f6fa 100644 --- a/config/common_base +++ b/config/common_base @@ -861,11 +861,11 @@ CONFIG_RTE_LIBRTE_VHOST_DEBUG=n CONFIG_RTE_LIBRTE_PMD_VHOST=n # -# Compile IFCVF driver +# Compile IFC driver # To compile, CONFIG_RTE_LIBRTE_VHOST and CONFIG_RTE_EAL_VFIO # should be enabled. # -CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD=n +CONFIG_RTE_LIBRTE_IFC_PMD=n # # Compile librte_bpf diff --git a/config/common_linuxapp b/config/common_linuxapp index 5c68cc0ff4..daa49d4efb 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -15,7 +15,7 @@ CONFIG_RTE_LIBRTE_PMD_KNI=y CONFIG_RTE_LIBRTE_VHOST=y CONFIG_RTE_LIBRTE_VHOST_NUMA=y CONFIG_RTE_LIBRTE_PMD_VHOST=y -CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD=y +CONFIG_RTE_LIBRTE_IFC_PMD=y CONFIG_RTE_LIBRTE_PMD_AF_PACKET=y CONFIG_RTE_LIBRTE_PMD_TAP=y CONFIG_RTE_LIBRTE_AVP_PMD=y diff --git a/doc/guides/nics/ifcvf.rst b/doc/guides/nics/ifc.rst similarity index 100% rename from doc/guides/nics/ifcvf.rst rename to doc/guides/nics/ifc.rst diff --git a/doc/guides/nics/index.rst b/doc/guides/nics/index.rst index ddb9eb7a92..d68c5ed5ea 100644 --- a/doc/guides/nics/index.rst +++ b/doc/guides/nics/index.rst @@ -24,7 +24,7 @@ Network Interface Controller Drivers enic fm10k i40e - ifcvf + ifc igb ixgbe intel_vf diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 9f9da66517..1ae0eaffbd 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -59,7 +59,7 @@ endif # $(CONFIG_RTE_LIBRTE_SCHED) ifeq ($(CONFIG_RTE_LIBRTE_VHOST),y) DIRS-$(CONFIG_RTE_LIBRTE_PMD_VHOST) += vhost ifeq ($(CONFIG_RTE_EAL_VFIO),y) -DIRS-$(CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD) += ifc +DIRS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += ifc endif endif # $(CONFIG_RTE_LIBRTE_VHOST) diff --git a/drivers/net/ifc/Makefile b/drivers/net/ifc/Makefile index 1011995bc9..39b36ae5d5 100644 --- a/drivers/net/ifc/Makefile +++ b/drivers/net/ifc/Makefile @@ -6,7 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk # # library name # -LIB = librte_ifcvf_vdpa.a +LIB = librte_pmd_ifc.a LDLIBS += -lpthread LDLIBS += -lrte_eal -lrte_pci -lrte_vhost -lrte_bus_pci @@ -22,14 +22,14 @@ BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*. VPATH += $(SRCDIR)/base -EXPORT_MAP := rte_ifcvf_version.map +EXPORT_MAP := rte_pmd_ifc_version.map LIBABIVER := 1 # # all source are stored in SRCS-y # -SRCS-$(CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD) += ifcvf_vdpa.c -SRCS-$(CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD) += ifcvf.c +SRCS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += ifcvf_vdpa.c +SRCS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += ifcvf.c include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ifc/rte_ifcvf_version.map b/drivers/net/ifc/rte_pmd_ifc_version.map similarity index 100% rename from drivers/net/ifc/rte_ifcvf_version.map rename to drivers/net/ifc/rte_pmd_ifc_version.map diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 1e32c83e75..87a0c80ff2 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -165,7 +165,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += -lrte_pmd_virtio ifeq ($(CONFIG_RTE_LIBRTE_VHOST),y) _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_VHOST) += -lrte_pmd_vhost ifeq ($(CONFIG_RTE_EAL_VFIO),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_IFCVF_VDPA_PMD) += -lrte_ifcvf_vdpa +_LDLIBS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += -lrte_pmd_ifc endif # $(CONFIG_RTE_EAL_VFIO) endif # $(CONFIG_RTE_LIBRTE_VHOST) _LDLIBS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += -lrte_pmd_vmxnet3_uio