diff mbox

[dpdk-dev,PATCH-18.08,08/15] net/ifc: rename to ifcvf

Message ID 20180517201526.28658-9-bruce.richardson@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Bruce Richardson
Headers

Checks

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

Commit Message

Bruce Richardson May 17, 2018, 8:15 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.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
CC: Xiao Wang <xiao.w.wang@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
 .../{ifc/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 May 18, 2018, 1:52 a.m. UTC | #1 
Hi Bruce,

> -----Original Message-----
> From: Richardson, Bruce
> Sent: Friday, May 18, 2018 4:15 AM
> To: dev@dpdk.org
> Cc: Richardson, Bruce <bruce.richardson@intel.com>; Wang, Xiao W
> <xiao.w.wang@intel.com>
> Subject: [PATCH-18.08 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.

Naming the directory as "ifc" allows us to add ifcpf driver into it in the future.

BRs,
Xiao

> 
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
> CC: Xiao Wang <xiao.w.wang@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
>  .../{ifc/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 2663f1c03..6f587477c 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -553,10 +553,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.11.0
Bruce Richardson May 18, 2018, 8:12 a.m. UTC | #2 
On Fri, May 18, 2018 at 02:52:36AM +0100, Wang, Xiao W wrote:
> Hi Bruce,
> 
> > -----Original Message-----
> > From: Richardson, Bruce
> > Sent: Friday, May 18, 2018 4:15 AM
> > To: dev@dpdk.org
> > Cc: Richardson, Bruce <bruce.richardson@intel.com>; Wang, Xiao W
> > <xiao.w.wang@intel.com>
> > Subject: [PATCH-18.08 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.
> 
> Naming the directory as "ifc" allows us to add ifcpf driver into it in the future.
> 
> BRs,
> Xiao
> 

At which point you will have to rename the version file, the rst
documentation file, the resulting shared library file etc. Right now, most
of the references are to ifcvf, with the only exception being the folder
name. This patch makes things consistent by having everything refer to
ifcvf.

If you prefer, I can do a v2 of this set renaming everything to ifc, but
that would be a lot bigger a job, and would also result in the driver file
itself getting a new name too. Unless there are immediate plans to add an
ifcpf driver, I think this change makes more sense.

/Bruce
Xiao Wang May 18, 2018, 4:37 p.m. UTC | #3 
Hi,

> -----Original Message-----
> From: Richardson, Bruce
> Sent: Friday, May 18, 2018 4:13 PM
> To: Wang, Xiao W <xiao.w.wang@intel.com>
> Cc: dev@dpdk.org
> Subject: Re: [PATCH-18.08 08/15] net/ifc: rename to ifcvf
> 
> On Fri, May 18, 2018 at 02:52:36AM +0100, Wang, Xiao W wrote:
> > Hi Bruce,
> >
> > > -----Original Message-----
> > > From: Richardson, Bruce
> > > Sent: Friday, May 18, 2018 4:15 AM
> > > To: dev@dpdk.org
> > > Cc: Richardson, Bruce <bruce.richardson@intel.com>; Wang, Xiao W
> > > <xiao.w.wang@intel.com>
> > > Subject: [PATCH-18.08 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.
> >
> > Naming the directory as "ifc" allows us to add ifcpf driver into it in the future.
> >
> > BRs,
> > Xiao
> >
> 
> At which point you will have to rename the version file, the rst
> documentation file, the resulting shared library file etc. Right now, most
> of the references are to ifcvf, with the only exception being the folder
> name. This patch makes things consistent by having everything refer to
> ifcvf.

OK.

> 
> If you prefer, I can do a v2 of this set renaming everything to ifc, but
> that would be a lot bigger a job, and would also result in the driver file
> itself getting a new name too. Unless there are immediate plans to add an
> ifcpf driver, I think this change makes more sense.

No need for that.

BRs,
Xiao
> 
> /Bruce
diff mbox

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 2663f1c03..6f587477c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -553,10 +553,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