From patchwork Tue Sep 15 02:24:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Yang X-Patchwork-Id: 77662 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 85554A04C7; Tue, 15 Sep 2020 04:30:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 550EF1BE8E; Tue, 15 Sep 2020 04:30:14 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id BDAB6E07 for ; Tue, 15 Sep 2020 04:30:12 +0200 (CEST) IronPort-SDR: flTBhFGfPvgrMzNN9B7ZCIaFph61yB1pYA6QufWN3NB0/1GenXTMHtgQdbvkmXfARj9JKdObix u3mv5yy4IVSg== X-IronPort-AV: E=McAfee;i="6000,8403,9744"; a="138694301" X-IronPort-AV: E=Sophos;i="5.76,428,1592895600"; d="scan'208";a="138694301" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Sep 2020 19:30:11 -0700 IronPort-SDR: 8he/bODGKBMPQcRIIKqwrf2Y0lwinxaDCZpsUqyUxGMJ3GMD7FMG9eK6xYtcFIKV0e5NAqTNOY u4ROTvdQB/ng== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,428,1592895600"; d="scan'208";a="319274281" Received: from intel-npg-odc-srv01.cd.intel.com ([10.240.178.136]) by orsmga002.jf.intel.com with ESMTP; 14 Sep 2020 19:30:09 -0700 From: SteveX Yang To: dev@dpdk.org Cc: bruce.richardson@intel.com, wenzhuo.lu@intel.com, beilei.xing@intel.com, qiming.yang@intel.com, SteveX Yang Date: Tue, 15 Sep 2020 02:24:58 +0000 Message-Id: <20200915022458.18913-1-stevex.yang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200911055811.16474-1-stevex.yang@intel.com> References: <20200911055811.16474-1-stevex.yang@intel.com> Subject: [dpdk-dev] [PATCH v3] app/test-pmd: fix meson build failed when enabled pmd_bonded X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- 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 #include #include -#ifdef RTE_LIBRTE_PMD_BOND +#ifdef RTE_LIBRTE_BOND_PMD #include #include #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 #include #include -#ifdef RTE_LIBRTE_PMD_BOND +#ifdef RTE_LIBRTE_BOND_PMD #include #endif #include