diff mbox

[ovs-dev,v3,2/5] netdev-dpdk: Consistent naming for vhost functions

Message ID 1469722875-8848-3-git-send-email-ciara.loftus@intel.com
State Superseded
Delegated to: Daniele Di Proietto
Headers show

Commit Message

Ciara Loftus July 28, 2016, 4:21 p.m. UTC 
A mix of vhost_user_ and vhost_ is used when naming vhost functions. The
'user_' has been dropped for consistency. Also remove empty
'vhost_user_class_init' function.

Signed-off-by: Ciara Loftus <ciara.loftus@intel.com>
Acked-by: Daniele Di Proietto <diproiettod@vmware.com>
---
 lib/netdev-dpdk.c | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)
diff mbox

Patch

diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c
index 7c6fc8a..d6959fe 100644
--- a/lib/netdev-dpdk.c
+++ b/lib/netdev-dpdk.c
@@ -803,7 +803,7 @@  dpdk_dev_parse_name(const char dev_name[], const char prefix[],
 }
 
 static int
-netdev_dpdk_vhost_user_construct(struct netdev *netdev)
+netdev_dpdk_vhost_construct(struct netdev *netdev)
 {
     struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
     const char *name = netdev->name;
@@ -2389,12 +2389,6 @@  dpdk_vhost_class_init(void)
     return 0;
 }
 
-static int
-dpdk_vhost_user_class_init(void)
-{
-    return 0;
-}
-
 static void
 dpdk_common_init(void)
 {
@@ -2790,7 +2784,7 @@  out:
 }
 
 static int
-netdev_dpdk_vhost_user_reconfigure(struct netdev *netdev)
+netdev_dpdk_vhost_reconfigure(struct netdev *netdev)
 {
     struct netdev_dpdk *dev = netdev_dpdk_cast(netdev);
     struct virtio_net *virtio_dev = netdev_dpdk_get_virtio(dev);
@@ -2829,7 +2823,7 @@  netdev_dpdk_vhost_user_reconfigure(struct netdev *netdev)
     return err;
 }
 
-#define NETDEV_DPDK_CLASS(NAME, INIT, CONSTRUCT, DESTRUCT,    \
+#define NETDEV_DPDK_CLASS(NAME, CONSTRUCT, DESTRUCT,          \
                           SET_CONFIG, SET_TX_MULTIQ, SEND,    \
                           GET_CARRIER, GET_STATS,             \
                           GET_FEATURES, GET_STATUS,           \
@@ -2837,7 +2831,7 @@  netdev_dpdk_vhost_user_reconfigure(struct netdev *netdev)
 {                                                             \
     NAME,                                                     \
     true,                       /* is_pmd */                  \
-    INIT,                       /* init */                    \
+    NULL,                       /* init */                    \
     NULL,                       /* netdev_dpdk_run */         \
     NULL,                       /* netdev_dpdk_wait */        \
                                                               \
@@ -3278,7 +3272,6 @@  dpdk_init(const struct smap *ovs_other_config)
 static const struct netdev_class dpdk_class =
     NETDEV_DPDK_CLASS(
         "dpdk",
-        NULL,
         netdev_dpdk_construct,
         netdev_dpdk_destruct,
         netdev_dpdk_set_config,
@@ -3294,7 +3287,6 @@  static const struct netdev_class dpdk_class =
 static const struct netdev_class dpdk_ring_class =
     NETDEV_DPDK_CLASS(
         "dpdkr",
-        NULL,
         netdev_dpdk_ring_construct,
         netdev_dpdk_destruct,
         netdev_dpdk_set_config,
@@ -3307,11 +3299,10 @@  static const struct netdev_class dpdk_ring_class =
         netdev_dpdk_reconfigure,
         netdev_dpdk_rxq_recv);
 
-static const struct netdev_class OVS_UNUSED dpdk_vhost_user_class =
+static const struct netdev_class OVS_UNUSED dpdk_vhost_class =
     NETDEV_DPDK_CLASS(
         "dpdkvhostuser",
-        dpdk_vhost_user_class_init,
-        netdev_dpdk_vhost_user_construct,
+        netdev_dpdk_vhost_construct,
         netdev_dpdk_vhost_destruct,
         NULL,
         NULL,
@@ -3320,7 +3311,7 @@  static const struct netdev_class OVS_UNUSED dpdk_vhost_user_class =
         netdev_dpdk_vhost_get_stats,
         NULL,
         NULL,
-        netdev_dpdk_vhost_user_reconfigure,
+        netdev_dpdk_vhost_reconfigure,
         netdev_dpdk_vhost_rxq_recv);
 
 void
@@ -3329,7 +3320,7 @@  netdev_dpdk_register(void)
     dpdk_common_init();
     netdev_register_provider(&dpdk_class);
     netdev_register_provider(&dpdk_ring_class);
-    netdev_register_provider(&dpdk_vhost_user_class);
+    netdev_register_provider(&dpdk_vhost_class);
 }
 
 void