From aa04a0ff8ee9aa7779b30e936f7fe1304c613d57 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Fri, 1 Apr 2016 12:34:24 +0200
Subject: Add option to link DPDK dynamically

Change-Id: Ie2b47f9020c8260b199d141103318a0261e16832
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 vnet/vnet/devices/dpdk/dpdk.h | 83 +++++++++++++++++++++++++++++++++++++++++++
 vnet/vnet/devices/dpdk/init.c | 77 ---------------------------------------
 2 files changed, 83 insertions(+), 77 deletions(-)

(limited to 'vnet')

diff --git a/vnet/vnet/devices/dpdk/dpdk.h b/vnet/vnet/devices/dpdk/dpdk.h
index 14f7b3e8518..e2bb1e2a107 100644
--- a/vnet/vnet/devices/dpdk/dpdk.h
+++ b/vnet/vnet/devices/dpdk/dpdk.h
@@ -575,4 +575,87 @@ format_function_t format_dpdk_rte_mbuf;
 format_function_t format_dpdk_rx_rte_mbuf;
 unformat_function_t unformat_socket_mem;
 
+
+static inline void
+dpdk_pmd_constructor_init()
+{
+  /* Add references to DPDK Driver Constructor functions to get the dynamic
+   * loader to pull in the driver library & run the constructors.
+   */
+#define _(d)                                            \
+  do {                                                  \
+    void devinitfn_ ##d(void);                          \
+    __attribute__((unused)) void (* volatile pf)(void); \
+    pf = devinitfn_ ##d;                                \
+  } while(0);
+
+#ifdef RTE_LIBRTE_EM_PMD
+  _(em_pmd_drv)
+#endif
+
+#ifdef RTE_LIBRTE_IGB_PMD
+  _(pmd_igb_drv)
+#endif
+
+#ifdef RTE_LIBRTE_IXGBE_PMD
+  _(rte_ixgbe_driver)
+#endif
+
+#ifdef RTE_LIBRTE_I40E_PMD
+  _(rte_i40e_driver)
+  _(rte_i40evf_driver)
+#endif
+
+#ifdef RTE_LIBRTE_FM10K_PMD
+  _(rte_fm10k_driver)
+#endif
+
+#ifdef RTE_LIBRTE_VIRTIO_PMD
+  _(rte_virtio_driver)
+#endif
+
+#ifdef RTE_LIBRTE_VMXNET3_PMD
+  _(rte_vmxnet3_driver)
+#endif
+
+#ifdef RTE_LIBRTE_VICE_PMD
+  _(rte_vice_driver)
+#endif
+
+#ifdef RTE_LIBRTE_ENIC_PMD
+  _(rte_enic_driver)
+#endif
+
+#ifdef RTE_LIBRTE_PMD_AF_PACKET
+  _(pmd_af_packet_drv)
+#endif
+
+#ifdef RTE_LIBRTE_CXGBE_PMD
+  _(rte_cxgbe_driver)
+#endif
+
+#ifdef RTE_LIBRTE_PMD_BOND
+  _(bond_drv)
+#endif
+
+#undef _
+
+/*
+ * At the moment, the ThunderX NIC driver doesn't have
+ * an entry point named "devinitfn_rte_xxx_driver"
+ */
+#define _(d)                                          \
+  do {                                                  \
+    void d(void);			                      \
+    __attribute__((unused)) void (* volatile pf)(void); \
+    pf = d;		                              \
+  } while(0);
+
+#ifdef RTE_LIBRTE_THUNDERVNIC_PMD
+  _(rte_nicvf_pmd_init)
+#endif
+#undef _
+
+}
+
 #endif /* __included_dpdk_h__ */
diff --git a/vnet/vnet/devices/dpdk/init.c b/vnet/vnet/devices/dpdk/init.c
index d57f6c1a594..e84f0de569b 100644
--- a/vnet/vnet/devices/dpdk/init.c
+++ b/vnet/vnet/devices/dpdk/init.c
@@ -1720,83 +1720,6 @@ dpdk_init (vlib_main_t * vm)
   ASSERT(offsetof(dpdk_worker_t, cacheline0) == 0);
   ASSERT(offsetof(frame_queue_trace_t, cacheline0) == 0);
 
-  /* Add references to DPDK Driver Constructor functions to get the dynamic
-   * loader to pull in the driver library & run the constructors.
-   */
-#define _(d)                                          \
-do {                                                  \
-  void devinitfn_ ##d(void);                          \
-  __attribute__((unused)) void (* volatile pf)(void); \
-  pf = devinitfn_ ##d;                                \
-} while(0);
-
-#ifdef RTE_LIBRTE_EM_PMD
-  _(em_pmd_drv)
-#endif
-
-#ifdef RTE_LIBRTE_IGB_PMD
-  _(pmd_igb_drv)
-#endif
-
-#ifdef RTE_LIBRTE_IXGBE_PMD
-  _(rte_ixgbe_driver)
-#endif
-
-#ifdef RTE_LIBRTE_I40E_PMD
-  _(rte_i40e_driver)
-  _(rte_i40evf_driver)
-#endif
-
-#ifdef RTE_LIBRTE_FM10K_PMD
-  _(rte_fm10k_driver)
-#endif
-
-#ifdef RTE_LIBRTE_VIRTIO_PMD
-  _(rte_virtio_driver)
-#endif
-
-#ifdef RTE_LIBRTE_VMXNET3_PMD
-  _(rte_vmxnet3_driver)
-#endif
-
-#ifdef RTE_LIBRTE_VICE_PMD
-  _(rte_vice_driver)
-#endif
-
-#ifdef RTE_LIBRTE_ENIC_PMD
-  _(rte_enic_driver)
-#endif
-
-#ifdef RTE_LIBRTE_PMD_AF_PACKET
-  _(pmd_af_packet_drv)
-#endif
-
-#ifdef RTE_LIBRTE_CXGBE_PMD
-  _(rte_cxgbe_driver)
-#endif
-
-#ifdef RTE_LIBRTE_PMD_BOND
-  _(bond_drv)
-#endif
-
-#undef _
-
-/* 
- * At the moment, the ThunderX NIC driver doesn't have
- * an entry point named "devinitfn_rte_xxx_driver"
- */
-#define _(d)                                          \
-do {                                                  \
-  void d(void);			                      \
-  __attribute__((unused)) void (* volatile pf)(void); \
-  pf = d;		                              \
-} while(0);
-
-#ifdef RTE_LIBRTE_THUNDERVNIC_PMD
-_(rte_nicvf_pmd_init)
-#endif
-#undef _
-
   dm->vlib_main = vm;
   dm->vnet_main = vnet_get_main();
 
-- 
cgit 1.2.3-korg