[v2,08/15] net/ifc: rename to ifcvf

Message ID 20180608212048.67261-9-bruce.richardson@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Ferruh Yigit
Headers
Series add meson support for more net drivers |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Bruce Richardson June 8, 2018, 9:20 p.m. UTC
  All files in the directory and the resulting driver have prefix of ifcvf,
not just ifc, so rename directory for accuracy. Also rename the map file
to standard name for meson build in the process.

CC: Xiao Wang <xiao.w.wang@intel.com>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 MAINTAINERS                                                   | 4 ++--
 drivers/net/Makefile                                          | 2 +-
 drivers/net/{ifc => ifcvf}/Makefile                           | 2 +-
 drivers/net/{ifc => ifcvf}/base/ifcvf.c                       | 0
 drivers/net/{ifc => ifcvf}/base/ifcvf.h                       | 0
 drivers/net/{ifc => ifcvf}/base/ifcvf_osdep.h                 | 0
 drivers/net/{ifc => ifcvf}/ifcvf_vdpa.c                       | 0
 .../rte_ifcvf_version.map => ifcvf/rte_pmd_ifcvf_version.map} | 0
 8 files changed, 4 insertions(+), 4 deletions(-)
 rename drivers/net/{ifc => ifcvf}/Makefile (94%)
 rename drivers/net/{ifc => ifcvf}/base/ifcvf.c (100%)
 rename drivers/net/{ifc => ifcvf}/base/ifcvf.h (100%)
 rename drivers/net/{ifc => ifcvf}/base/ifcvf_osdep.h (100%)
 rename drivers/net/{ifc => ifcvf}/ifcvf_vdpa.c (100%)
 rename drivers/net/{ifc/rte_ifcvf_version.map => ifcvf/rte_pmd_ifcvf_version.map} (100%)
  

Comments

Xiao Wang June 13, 2018, 2:46 a.m. UTC | #1
Hi Bruce,

> -----Original Message-----
> From: Richardson, Bruce
> Sent: Saturday, June 9, 2018 5:21 AM
> To: dev@dpdk.org
> Cc: Richardson, Bruce <bruce.richardson@intel.com>; Wang, Xiao W
> <xiao.w.wang@intel.com>
> Subject: [PATCH v2 08/15] net/ifc: rename to ifcvf
> 
> All files in the directory and the resulting driver have prefix of ifcvf,
> not just ifc, so rename directory for accuracy. Also rename the map file
> to standard name for meson build in the process.

Compared with renaming the dir to IFCVF and renaming it back to IFC sometime in future,
I think keeping the dir name as IFC is better for us, this avoids the extra effort.
We can just rename below files:
doc/guides/nics/ifcvf.rst => doc/guides/nics/ifc.rst
drivers/net/ifc/rte_ifcvf_version.map => drivers/net/ifc/rte_pmd_ifc_version.

And yes, we need to update documents which refer to ifc.

Thanks!
Xiao

> 
> CC: Xiao Wang <xiao.w.wang@intel.com>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
>  MAINTAINERS                                                   | 4 ++--
>  drivers/net/Makefile                                          | 2 +-
>  drivers/net/{ifc => ifcvf}/Makefile                           | 2 +-
>  drivers/net/{ifc => ifcvf}/base/ifcvf.c                       | 0
>  drivers/net/{ifc => ifcvf}/base/ifcvf.h                       | 0
>  drivers/net/{ifc => ifcvf}/base/ifcvf_osdep.h                 | 0
>  drivers/net/{ifc => ifcvf}/ifcvf_vdpa.c                       | 0
>  .../rte_ifcvf_version.map => ifcvf/rte_pmd_ifcvf_version.map} | 0
>  8 files changed, 4 insertions(+), 4 deletions(-)
>  rename drivers/net/{ifc => ifcvf}/Makefile (94%)
>  rename drivers/net/{ifc => ifcvf}/base/ifcvf.c (100%)
>  rename drivers/net/{ifc => ifcvf}/base/ifcvf.h (100%)
>  rename drivers/net/{ifc => ifcvf}/base/ifcvf_osdep.h (100%)
>  rename drivers/net/{ifc => ifcvf}/ifcvf_vdpa.c (100%)
>  rename drivers/net/{ifc/rte_ifcvf_version.map =>
> ifcvf/rte_pmd_ifcvf_version.map} (100%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 4667fa7fb..4f6055590 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -559,10 +559,10 @@ T: git://dpdk.org/next/dpdk-next-net-intel
>  F: drivers/net/avf/
>  F: doc/guides/nics/features/avf*.ini
> 
> -Intel ifc
> +Intel ifcvf
>  M: Xiao Wang <xiao.w.wang@intel.com>
>  T: git://dpdk.org/next/dpdk-next-net-intel
> -F: drivers/net/ifc/
> +F: drivers/net/ifcvf/
>  F: doc/guides/nics/ifcvf.rst
>  F: doc/guides/nics/features/ifcvf.ini
> 
> diff --git a/drivers/net/Makefile b/drivers/net/Makefile
> index 9f9da6651..9308f9a7b 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_IFCVF_VDPA_PMD) += ifcvf
>  endif
>  endif # $(CONFIG_RTE_LIBRTE_VHOST)
> 
> diff --git a/drivers/net/ifc/Makefile b/drivers/net/ifcvf/Makefile
> similarity index 94%
> rename from drivers/net/ifc/Makefile
> rename to drivers/net/ifcvf/Makefile
> index 1011995bc..a022faaad 100644
> --- a/drivers/net/ifc/Makefile
> +++ b/drivers/net/ifcvf/Makefile
> @@ -22,7 +22,7 @@ BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir
> $(wildcard $(SRCDIR)/base/*.
> 
>  VPATH += $(SRCDIR)/base
> 
> -EXPORT_MAP := rte_ifcvf_version.map
> +EXPORT_MAP := rte_pmd_ifcvf_version.map
> 
>  LIBABIVER := 1
> 
> diff --git a/drivers/net/ifc/base/ifcvf.c b/drivers/net/ifcvf/base/ifcvf.c
> similarity index 100%
> rename from drivers/net/ifc/base/ifcvf.c
> rename to drivers/net/ifcvf/base/ifcvf.c
> diff --git a/drivers/net/ifc/base/ifcvf.h b/drivers/net/ifcvf/base/ifcvf.h
> similarity index 100%
> rename from drivers/net/ifc/base/ifcvf.h
> rename to drivers/net/ifcvf/base/ifcvf.h
> diff --git a/drivers/net/ifc/base/ifcvf_osdep.h
> b/drivers/net/ifcvf/base/ifcvf_osdep.h
> similarity index 100%
> rename from drivers/net/ifc/base/ifcvf_osdep.h
> rename to drivers/net/ifcvf/base/ifcvf_osdep.h
> diff --git a/drivers/net/ifc/ifcvf_vdpa.c b/drivers/net/ifcvf/ifcvf_vdpa.c
> similarity index 100%
> rename from drivers/net/ifc/ifcvf_vdpa.c
> rename to drivers/net/ifcvf/ifcvf_vdpa.c
> diff --git a/drivers/net/ifc/rte_ifcvf_version.map
> b/drivers/net/ifcvf/rte_pmd_ifcvf_version.map
> similarity index 100%
> rename from drivers/net/ifc/rte_ifcvf_version.map
> rename to drivers/net/ifcvf/rte_pmd_ifcvf_version.map
> --
> 2.17.1
  
Bruce Richardson June 13, 2018, 10:19 a.m. UTC | #2
On Wed, Jun 13, 2018 at 03:46:05AM +0100, Wang, Xiao W wrote:
> Hi Bruce,
> 
> > -----Original Message-----
> > From: Richardson, Bruce
> > Sent: Saturday, June 9, 2018 5:21 AM
> > To: dev@dpdk.org
> > Cc: Richardson, Bruce <bruce.richardson@intel.com>; Wang, Xiao W
> > <xiao.w.wang@intel.com>
> > Subject: [PATCH v2 08/15] net/ifc: rename to ifcvf
> > 
> > All files in the directory and the resulting driver have prefix of ifcvf,
> > not just ifc, so rename directory for accuracy. Also rename the map file
> > to standard name for meson build in the process.
> 
> Compared with renaming the dir to IFCVF and renaming it back to IFC sometime in future,
> I think keeping the dir name as IFC is better for us, this avoids the extra effort.
> We can just rename below files:
> doc/guides/nics/ifcvf.rst => doc/guides/nics/ifc.rst
> drivers/net/ifc/rte_ifcvf_version.map => drivers/net/ifc/rte_pmd_ifc_version.
> 
> And yes, we need to update documents which refer to ifc.
> 
> Thanks!
> Xiao
> 
Ok, that can work.
  

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 4667fa7fb..4f6055590 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -559,10 +559,10 @@  T: git://dpdk.org/next/dpdk-next-net-intel
 F: drivers/net/avf/
 F: doc/guides/nics/features/avf*.ini
 
-Intel ifc
+Intel ifcvf
 M: Xiao Wang <xiao.w.wang@intel.com>
 T: git://dpdk.org/next/dpdk-next-net-intel
-F: drivers/net/ifc/
+F: drivers/net/ifcvf/
 F: doc/guides/nics/ifcvf.rst
 F: doc/guides/nics/features/ifcvf.ini
 
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 9f9da6651..9308f9a7b 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_IFCVF_VDPA_PMD) += ifcvf
 endif
 endif # $(CONFIG_RTE_LIBRTE_VHOST)
 
diff --git a/drivers/net/ifc/Makefile b/drivers/net/ifcvf/Makefile
similarity index 94%
rename from drivers/net/ifc/Makefile
rename to drivers/net/ifcvf/Makefile
index 1011995bc..a022faaad 100644
--- a/drivers/net/ifc/Makefile
+++ b/drivers/net/ifcvf/Makefile
@@ -22,7 +22,7 @@  BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.
 
 VPATH += $(SRCDIR)/base
 
-EXPORT_MAP := rte_ifcvf_version.map
+EXPORT_MAP := rte_pmd_ifcvf_version.map
 
 LIBABIVER := 1
 
diff --git a/drivers/net/ifc/base/ifcvf.c b/drivers/net/ifcvf/base/ifcvf.c
similarity index 100%
rename from drivers/net/ifc/base/ifcvf.c
rename to drivers/net/ifcvf/base/ifcvf.c
diff --git a/drivers/net/ifc/base/ifcvf.h b/drivers/net/ifcvf/base/ifcvf.h
similarity index 100%
rename from drivers/net/ifc/base/ifcvf.h
rename to drivers/net/ifcvf/base/ifcvf.h
diff --git a/drivers/net/ifc/base/ifcvf_osdep.h b/drivers/net/ifcvf/base/ifcvf_osdep.h
similarity index 100%
rename from drivers/net/ifc/base/ifcvf_osdep.h
rename to drivers/net/ifcvf/base/ifcvf_osdep.h
diff --git a/drivers/net/ifc/ifcvf_vdpa.c b/drivers/net/ifcvf/ifcvf_vdpa.c
similarity index 100%
rename from drivers/net/ifc/ifcvf_vdpa.c
rename to drivers/net/ifcvf/ifcvf_vdpa.c
diff --git a/drivers/net/ifc/rte_ifcvf_version.map b/drivers/net/ifcvf/rte_pmd_ifcvf_version.map
similarity index 100%
rename from drivers/net/ifc/rte_ifcvf_version.map
rename to drivers/net/ifcvf/rte_pmd_ifcvf_version.map