[14/15] net/vmxnet3: rename version map after library file name

Message ID 20180910200415.8340-15-bluca@debian.org (mailing list archive)
State Superseded, archived
Headers
Series rename PMDs map files to match library name and add Meson files |

Checks

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

Commit Message

Luca Boccassi Sept. 10, 2018, 8:04 p.m. UTC
  The library is called librte_pmd_vmxnet3_uio, so rename the map
file and set the name in the meson file so that the built library names
with meson and legacy makefiles are the same

Signed-off-by: Luca Boccassi <bluca@debian.org>
---
 drivers/net/vmxnet3/Makefile                                    | 2 +-
 ..._pmd_vmxnet3_version.map => rte_pmd_vmxnet3_uio_version.map} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename drivers/net/vmxnet3/{rte_pmd_vmxnet3_version.map => rte_pmd_vmxnet3_uio_version.map} (100%)
  

Comments

Yong Wang Sept. 13, 2018, 9:44 p.m. UTC | #1
-----Original Message-----
From: Luca Boccassi <bluca@debian.org>
Date: Monday, September 10, 2018 at 1:05 PM
To: "dev@dpdk.org" <dev@dpdk.org>
Cc: "keith.wiles@intel.com" <keith.wiles@intel.com>, "roy.fan.zhang@intel.com" <roy.fan.zhang@intel.com>, "jingjing.wu@intel.com" <jingjing.wu@intel.com>, "wenzhuo.lu@intel.com" <wenzhuo.lu@intel.com>, "rasesh.mody@cavium.com" <rasesh.mody@cavium.com>, "harish.patil@cavium.com" <harish.patil@cavium.com>, "shahed.shaikh@cavium.com" <shahed.shaikh@cavium.com>, "amr.mokhtar@intel.com" <amr.mokhtar@intel.com>, "shijith.thotton@cavium.com" <shijith.thotton@cavium.com>, "ssrinivasan@cavium.com" <ssrinivasan@cavium.com>, "liang.j.ma@intel.com" <liang.j.ma@intel.com>, "peter.mccarthy@intel.com" <peter.mccarthy@intel.com>, "jerin.jacob@caviumnetworks.com" <jerin.jacob@caviumnetworks.com>, "maciej.czekaj@caviumnetworks.com" <maciej.czekaj@caviumnetworks.com>, "arybchenko@solarflare.com" <arybchenko@solarflare.com>, "antosh.shukla@caviumnetworks.com" <antosh.shukla@caviumnetworks.com>, "ashish.gupta@cavium.com" <ashish.gupta@cavium.com>, Yong Wang <yongwang@vmware.com>, "bruce.richardson@intel.com" <bruce.richardson@intel.com>, "thomas@monjalon.net" <thomas@monjalon.net>
Subject: [PATCH 14/15] net/vmxnet3: rename version map after library file name

    The library is called librte_pmd_vmxnet3_uio, so rename the map
    file and set the name in the meson file so that the built library names
    with meson and legacy makefiles are the same
    
    Signed-off-by: Luca Boccassi <bluca@debian.org>
    ---

Not directly related to this change but I have some question on the uio naming.  The original motivation is from the following commit:

commit 1daf0aae7fd6b3bc38952e9817a1653c1258be66
Author: Thomas Monjalon <thomas.monjalon@6wind.com>
Date:   Fri Mar 21 13:52:17 2014 +0100

    vmxnet3: rename library
    
    In order to distinguish clearly this implementation from the extension
    vmxnet3-usermap, it is renamed to reflect its usage of uio framework.
    
    Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
    Acked-by: Thomas Graf <tgraf@redhat.com>

However, this version of vmxnet3 can also be bound to vfio-pci driver.  I think having the uio naming in that case will be misleading. 

     drivers/net/vmxnet3/Makefile                                    | 2 +-
     ..._pmd_vmxnet3_version.map => rte_pmd_vmxnet3_uio_version.map} | 0
     2 files changed, 1 insertion(+), 1 deletion(-)
     rename drivers/net/vmxnet3/{rte_pmd_vmxnet3_version.map => rte_pmd_vmxnet3_uio_version.map} (100%)
    
    diff --git a/drivers/net/vmxnet3/Makefile b/drivers/net/vmxnet3/Makefile
    index f1141da674..9848cd224f 100644
    --- a/drivers/net/vmxnet3/Makefile
    +++ b/drivers/net/vmxnet3/Makefile
    @@ -43,7 +43,7 @@ LDLIBS += -lrte_bus_pci
     
     VPATH += $(SRCDIR)/base
     
    -EXPORT_MAP := rte_pmd_vmxnet3_version.map
    +EXPORT_MAP := rte_pmd_vmxnet3_uio_version.map
     
     LIBABIVER := 1
     
    diff --git a/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map b/drivers/net/vmxnet3/rte_pmd_vmxnet3_uio_version.map
    similarity index 100%
    rename from drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map
    rename to drivers/net/vmxnet3/rte_pmd_vmxnet3_uio_version.map
    -- 
    2.18.0
  
Thomas Monjalon Sept. 14, 2018, 7:46 a.m. UTC | #2
13/09/2018 23:44, Yong Wang:
> From: Luca Boccassi <bluca@debian.org>
>     The library is called librte_pmd_vmxnet3_uio, so rename the map
>     file and set the name in the meson file so that the built library names
>     with meson and legacy makefiles are the same
>     
>     Signed-off-by: Luca Boccassi <bluca@debian.org>
>     ---
> 
> Not directly related to this change but I have some question on the uio naming.  The original motivation is from the following commit:
> 
> commit 1daf0aae7fd6b3bc38952e9817a1653c1258be66
> Author: Thomas Monjalon <thomas.monjalon@6wind.com>
> Date:   Fri Mar 21 13:52:17 2014 +0100
> 
>     vmxnet3: rename library
>     
>     In order to distinguish clearly this implementation from the extension
>     vmxnet3-usermap, it is renamed to reflect its usage of uio framework.
>     
>     Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
>     Acked-by: Thomas Graf <tgraf@redhat.com>
> 
> However, this version of vmxnet3 can also be bound to vfio-pci driver.  I think having the uio naming in that case will be misleading. 

Yes, i agree.
vmxnet3-usermap is not maintained anymore, so we can remove the uio suffix.
  

Patch

diff --git a/drivers/net/vmxnet3/Makefile b/drivers/net/vmxnet3/Makefile
index f1141da674..9848cd224f 100644
--- a/drivers/net/vmxnet3/Makefile
+++ b/drivers/net/vmxnet3/Makefile
@@ -43,7 +43,7 @@  LDLIBS += -lrte_bus_pci
 
 VPATH += $(SRCDIR)/base
 
-EXPORT_MAP := rte_pmd_vmxnet3_version.map
+EXPORT_MAP := rte_pmd_vmxnet3_uio_version.map
 
 LIBABIVER := 1
 
diff --git a/drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map b/drivers/net/vmxnet3/rte_pmd_vmxnet3_uio_version.map
similarity index 100%
rename from drivers/net/vmxnet3/rte_pmd_vmxnet3_version.map
rename to drivers/net/vmxnet3/rte_pmd_vmxnet3_uio_version.map