DPDK patches and discussions
 help / color / mirror / Atom feed
From: SteveX Yang <stevex.yang@intel.com>
To: dev@dpdk.org
Cc: bruce.richardson@intel.com, wenzhuo.lu@intel.com,
	beilei.xing@intel.com, qiming.yang@intel.com,
	SteveX Yang <stevex.yang@intel.com>
Subject: [dpdk-dev] [PATCH v3] app/test-pmd: fix meson build failed when enabled pmd_bonded
Date: Tue, 15 Sep 2020 02:24:58 +0000
Message-ID: <20200915022458.18913-1-stevex.yang@intel.com> (raw)
In-Reply-To: <20200911055811.16474-1-stevex.yang@intel.com>

The depended pmd bond is missing for test-pmd. Add the pmd_bond to deps,
and replace the relative MACRO name with new RTE_LIBRTE_BOND_PMD.

Fixes: 2950a769315e ("bond: testpmd support")

Signed-off-by: SteveX Yang <stevex.yang@intel.com>
---
v2->v3:
 * added fixline;
v1->v2:
 * replaced the bond pmd MACRO with the new one;
 * removed header paths cflags of bond pmd;
---
 app/test-pmd/cmdline.c    | 10 +++++-----
 app/test-pmd/meson.build  |  3 +++
 app/test-pmd/parameters.c |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 0a6ed85f3..91e408904 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -50,7 +50,7 @@
 #include <cmdline_parse_etheraddr.h>
 #include <cmdline_socket.h>
 #include <cmdline.h>
-#ifdef RTE_LIBRTE_PMD_BOND
+#ifdef RTE_LIBRTE_BOND_PMD
 #include <rte_eth_bond.h>
 #include <rte_eth_bond_8023ad.h>
 #endif
@@ -597,7 +597,7 @@ static void cmd_help_long_parsed(void *parsed_result,
 			"   Show the bypass configuration for a bypass enabled NIC"
 			" using the lowest port on the NIC.\n\n"
 
-#ifdef RTE_LIBRTE_PMD_BOND
+#ifdef RTE_LIBRTE_BOND_PMD
 			"create bonded device (mode) (socket)\n"
 			"	Create a new bonded device with specific bonding mode and socket.\n\n"
 
@@ -5732,7 +5732,7 @@ cmdline_parse_inst_t cmd_show_bypass_config = {
 	},
 };
 
-#ifdef RTE_LIBRTE_PMD_BOND
+#ifdef RTE_LIBRTE_BOND_PMD
 /* *** SET BONDING MODE *** */
 struct cmd_set_bonding_mode_result {
 	cmdline_fixed_string_t set;
@@ -6502,7 +6502,7 @@ cmdline_parse_inst_t cmd_set_bonding_agg_mode_policy = {
 };
 
 
-#endif /* RTE_LIBRTE_PMD_BOND */
+#endif /* RTE_LIBRTE_BOND_PMD */
 
 /* *** SET FORWARDING MODE *** */
 struct cmd_set_fwd_mode_result {
@@ -19430,7 +19430,7 @@ cmdline_parse_ctx_t main_ctx[] = {
 	(cmdline_parse_inst_t *)&cmd_set_bypass_event,
 	(cmdline_parse_inst_t *)&cmd_set_bypass_timeout,
 	(cmdline_parse_inst_t *)&cmd_show_bypass_config,
-#ifdef RTE_LIBRTE_PMD_BOND
+#ifdef RTE_LIBRTE_BOND_PMD
 	(cmdline_parse_inst_t *) &cmd_set_bonding_mode,
 	(cmdline_parse_inst_t *) &cmd_show_bonding_config,
 	(cmdline_parse_inst_t *) &cmd_set_bonding_primary,
diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build
index ea56e547b..7ad87d010 100644
--- a/app/test-pmd/meson.build
+++ b/app/test-pmd/meson.build
@@ -25,6 +25,9 @@ sources = files('5tswap.c',
 	'util.c')
 
 deps += ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci']
+if dpdk_conf.has('RTE_LIBRTE_BOND_PMD')
+	deps += 'pmd_bond'
+endif
 if dpdk_conf.has('RTE_LIBRTE_PDUMP')
 	deps += 'pdump'
 endif
diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 7cb0e3d6e..c48e28cf4 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -39,7 +39,7 @@
 #include <rte_ether.h>
 #include <rte_ethdev.h>
 #include <rte_string_fns.h>
-#ifdef RTE_LIBRTE_PMD_BOND
+#ifdef RTE_LIBRTE_BOND_PMD
 #include <rte_eth_bond.h>
 #endif
 #include <rte_flow.h>
-- 
2.17.1


  parent reply	other threads:[~2020-09-15  2:30 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-10  1:55 [dpdk-dev] [PATCH v1] " SteveX Yang
2020-09-10  9:16 ` Bruce Richardson
2020-09-10 11:12   ` Bruce Richardson
2020-09-11  5:58 ` [dpdk-dev] [PATCH v2] " SteveX Yang
2020-09-11  7:23   ` Yang, Qiming
2020-09-11  7:43   ` David Marchand
2020-09-11  8:36     ` Bruce Richardson
     [not found]       ` <DM6PR11MB436292727A47B651746AB246F9240@DM6PR11MB4362.namprd11.prod.outlook.com>
2020-09-11  9:40         ` Bruce Richardson
     [not found]           ` <DM6PR11MB4362CF8D42FE275B79B84978F9230@DM6PR11MB4362.namprd11.prod.outlook.com>
2020-09-14  8:33             ` Bruce Richardson
2020-09-14 16:24             ` Bruce Richardson
2020-09-11 11:32     ` David Marchand
2020-09-11 14:45       ` Bruce Richardson
2020-09-14  8:46         ` David Marchand
2020-09-16 16:46       ` Richardson, Bruce
2020-09-15  2:24   ` SteveX Yang [this message]
2020-09-30 16:29     ` [dpdk-dev] [PATCH v3] " Ferruh Yigit

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200915022458.18913-1-stevex.yang@intel.com \
    --to=stevex.yang@intel.com \
    --cc=beilei.xing@intel.com \
    --cc=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    --cc=qiming.yang@intel.com \
    --cc=wenzhuo.lu@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

DPDK patches and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git