> -----Original Message----- > From: dev [mailto:dev-bounces at dpdk.org] On Behalf Of Simon Kagstrom > Sent: Wednesday, May 20, 2015 1:24 PM > To: dev at dpdk.org > Subject: [dpdk-dev] [PATCH] eal_common_options: Allow combining -m and -- > no-huge > > Needed to run as non-root but with higher memory allocations. > > Signed-off-by: Simon Kagstrom <simon.kagstrom at netinsight.net> > Signed-off-by: Johan Faltstrom <johan.faltstrom at netinsight.net> > --- > lib/librte_eal/common/eal_common_options.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/lib/librte_eal/common/eal_common_options.c > b/lib/librte_eal/common/eal_common_options.c > index 8fcb1ab..89b867d 100644 > --- a/lib/librte_eal/common/eal_common_options.c > +++ b/lib/librte_eal/common/eal_common_options.c > @@ -851,8 +851,8 @@ eal_check_common_options(struct internal_config > *internal_cfg) > 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 " > + (internal_cfg->force_sockets == 1)) { > + RTE_LOG(ERR, EAL, "Option --"OPT_SOCKET_MEM" cannot " > "be specified together with --"OPT_NO_HUGE"\n"); > return -1; > }
Hi, Minor comments. * Without mem_parsed the () aren't required and the conditional will fit on one line. * The section prefix on the first/subject line should be "eal:" and the commit message/justification could be clearer. It would be worth doing a "git log" on the file and following the previous conventions for commit message on that component/file. John
