From 287d53f44d8d4b9697695d3fdaa76a94a49b1e8e Mon Sep 17 00:00:00 2001 From: Todd Foggoa Date: Wed, 2 Mar 2016 10:52:53 -0800 Subject: Always showing DPDK physical memory on bootup Fixing a previous commit to remove the commandline option and just always display the DPDK physical memory on startup. Also remove the DPDK args for the dbeug image. Change-Id: I9336a2a26ebab84c3b50ae0610025c29da7995f2 Signed-off-by: Todd Foggoa --- vnet/vnet/devices/dpdk/init.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'vnet') diff --git a/vnet/vnet/devices/dpdk/init.c b/vnet/vnet/devices/dpdk/init.c index e8fe554c32f..668120cff0a 100644 --- a/vnet/vnet/devices/dpdk/init.c +++ b/vnet/vnet/devices/dpdk/init.c @@ -963,7 +963,6 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) u8 no_pci = 0; u8 no_huge = 0; u8 huge_dir = 0; - u8 dump_physmem = 0; u8 file_prefix = 0; u8 * socket_mem = 0; @@ -1030,8 +1029,6 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) } #endif - else if (unformat (input, "dump-physmem")) - dump_physmem = 1; else if (unformat (input, "num-mbufs %d", &dm->num_mbufs)) ; else if (unformat (input, "max-tx-queues %d", &dm->max_tx_queues)) @@ -1414,16 +1411,6 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) dm->eal_init_args_str = format(dm->eal_init_args_str, "%s ", dm->eal_init_args[i]); - if (CLIB_DEBUG > 0) - { - int ix; - - clib_warning ("DPDK eal init args:\n"); - for (ix=0; ixeal_init_args); ix++) { - clib_warning (" %s\n", dm->eal_init_args[ix]); - } - } - ret = rte_eal_init(vec_len(dm->eal_init_args), (char **) dm->eal_init_args); /* lazy umount hugepages */ @@ -1433,10 +1420,8 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) return clib_error_return (0, "rte_eal_init returned %d", ret); /* Dump the physical memory layout prior to creating the mbuf_pool */ - if (dump_physmem) { - fprintf(stdout, "DPDK physical memory layout:\n"); - rte_dump_physmem_layout(stdout); - } + fprintf(stdout, "DPDK physical memory layout:\n"); + rte_dump_physmem_layout(stdout); /* main thread 1st */ error = vlib_buffer_pool_create(vm, dm->num_mbufs, MBUF_SIZE, rte_socket_id()); -- cgit 1.2.3-korg