From a7de7e6beb6964b8ff9c1c913a519e76248923af Mon Sep 17 00:00:00 2001 From: Simon Kagstrom Date: Wed, 27 May 2015 11:30:16 +0200 Subject: [PATCH] eal: allow combining -m and --no-huge Needed to run as non-root but with higher memory allocations, and removes a constraint on no-huge mode being limited to 64M. A usage example is if running with file input with the pcap PMD, which can be done as non-root after this patch via e.g., ./test-dpdk --no-huge -m 1024 -l 0,1 -n3 --vdev 'eth_pcap0,rx_pcap=eth-rx.pcap,tx_pcap=eth-tx.pcap' Signed-off-by: Simon Kagstrom Signed-off-by: Johan Faltstrom Acked-by: David Marchand --- lib/librte_eal/common/eal_common_options.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c index 8fcb1abeca..1f459accd3 100644 --- a/lib/librte_eal/common/eal_common_options.c +++ b/lib/librte_eal/common/eal_common_options.c @@ -850,9 +850,8 @@ eal_check_common_options(struct internal_config *internal_cfg) "be specified at the same time\n"); return -1; } - if (internal_cfg->no_hugetlbfs && - (mem_parsed || internal_cfg->force_sockets == 1)) { - RTE_LOG(ERR, EAL, "Options -m or --"OPT_SOCKET_MEM" cannot " + if (internal_cfg->no_hugetlbfs && internal_cfg->force_sockets == 1) { + RTE_LOG(ERR, EAL, "Option --"OPT_SOCKET_MEM" cannot " "be specified together with --"OPT_NO_HUGE"\n"); return -1; } -- 2.20.1