diff options
Diffstat (limited to 'src/plugins/dpdk')
-rwxr-xr-x | src/plugins/dpdk/api/dpdk_api.c | 11 | ||||
-rw-r--r-- | src/plugins/dpdk/device/cli.c | 6 | ||||
-rw-r--r-- | src/plugins/dpdk/device/dpdk.h | 1 | ||||
-rw-r--r-- | src/plugins/dpdk/device/init.c | 7 | ||||
-rw-r--r-- | src/plugins/dpdk/main.c | 10 |
5 files changed, 20 insertions, 15 deletions
diff --git a/src/plugins/dpdk/api/dpdk_api.c b/src/plugins/dpdk/api/dpdk_api.c index 97c4bc75721..5ff8d5f2f41 100755 --- a/src/plugins/dpdk/api/dpdk_api.c +++ b/src/plugins/dpdk/api/dpdk_api.c @@ -297,10 +297,6 @@ dpdk_api_init (vlib_main_t * vm) dpdk_main_t *dm = &dpdk_main; clib_error_t *error = 0; - /* init CLI */ - if ((error = vlib_call_init_function (vm, dpdk_init))) - return error; - u8 *name; name = format (0, "dpdk_%08x%c", api_version, 0); @@ -320,8 +316,11 @@ dpdk_api_init (vlib_main_t * vm) return error; } -VLIB_INIT_FUNCTION (dpdk_api_init); - +/* *INDENT-OFF* */ +VLIB_INIT_FUNCTION (dpdk_api_init) = +{ + .runs_after = VLIB_INITS ("dpdk_init"), +/* *INDENT-OFF* */ /* * fd.io coding-style-patch-verification: ON diff --git a/src/plugins/dpdk/device/cli.c b/src/plugins/dpdk/device/cli.c index 765b298f8a9..04cf37f5304 100644 --- a/src/plugins/dpdk/device/cli.c +++ b/src/plugins/dpdk/device/cli.c @@ -1737,6 +1737,12 @@ VLIB_CLI_COMMAND (show_vpe_version_command, static) = { }; /* *INDENT-ON* */ +/* Dummy function to get us linked in. */ +void +dpdk_cli_reference (void) +{ +} + clib_error_t * dpdk_cli_init (vlib_main_t * vm) { diff --git a/src/plugins/dpdk/device/dpdk.h b/src/plugins/dpdk/device/dpdk.h index bd9b35901d5..f79465cf8b4 100644 --- a/src/plugins/dpdk/device/dpdk.h +++ b/src/plugins/dpdk/device/dpdk.h @@ -512,6 +512,7 @@ clib_error_t *unformat_hqos (unformat_input_t * input, struct rte_pci_device *dpdk_get_pci_device (const struct rte_eth_dev_info *info); +void dpdk_cli_reference (void); #if CLI_DEBUG int dpdk_buffer_validate_trajectory_all (u32 * uninitialized); diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c index c83b2b57c4c..22ea659094b 100644 --- a/src/plugins/dpdk/device/init.c +++ b/src/plugins/dpdk/device/init.c @@ -1734,6 +1734,8 @@ dpdk_init (vlib_main_t * vm) STATIC_ASSERT (RTE_CACHE_LINE_SIZE == 1 << CLIB_LOG2_CACHE_LINE_BYTES, "DPDK RTE CACHE LINE SIZE does not match with 1<<CLIB_LOG2_CACHE_LINE_BYTES"); + dpdk_cli_reference (); + dm->vlib_main = vm; dm->vnet_main = vnet_get_main (); dm->conf = &dpdk_config_main; @@ -1751,10 +1753,6 @@ dpdk_init (vlib_main_t * vm) dm->stat_poll_interval = DPDK_STATS_POLL_INTERVAL; dm->link_state_poll_interval = DPDK_LINK_POLL_INTERVAL; - /* init CLI */ - if ((error = vlib_call_init_function (vm, dpdk_cli_init))) - return error; - dm->log_default = vlib_log_register_class ("dpdk", 0); return error; @@ -1762,7 +1760,6 @@ dpdk_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (dpdk_init); - /* * fd.io coding-style-patch-verification: ON * diff --git a/src/plugins/dpdk/main.c b/src/plugins/dpdk/main.c index d22b671e008..a1ea9e32c93 100644 --- a/src/plugins/dpdk/main.c +++ b/src/plugins/dpdk/main.c @@ -85,16 +85,18 @@ static clib_error_t * dpdk_main_init (vlib_main_t * vm) dm->vlib_main = vm; dm->vnet_main = vnet_get_main (); - if ((error = vlib_call_init_function (vm, dpdk_init))) - return error; - /* register custom delay function */ rte_delay_us_callback_register (rte_delay_us_override_cb); return error; } -VLIB_INIT_FUNCTION (dpdk_main_init); +/* *INDENT-OFF* */ +VLIB_INIT_FUNCTION (dpdk_main_init) = +{ + .runs_after = VLIB_INITS("dpdk_init"), +}; +/* *INDENT-ON* */ clib_error_t * |