diff mbox

[dpdk-dev,10/11] app/testpmd: compile even if ixgbe anf bnxt pmds are not compiling

Message ID 1507987683-12315-10-git-send-email-aviadye@dev.mellanox.co.il (mailing list archive)
State Changes Requested, archived
Delegated to: Pablo de Lara Guarch
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Aviad Yehezkel Oct. 14, 2017, 1:28 p.m. UTC 
  From: Aviad Yehezkel <aviadye@mellanox.com>

Signed-off-by: Aviad Yehezkel <aviadye@mellanox.com>
Signed-off-by: Nicolai Radu <radu.nicolai@intel.com>
---
 app/test-pmd/cmdline.c | 13 ++++++++++---
 app/test-pmd/config.c  | 12 +++++++++++-
 2 files changed, 21 insertions(+), 4 deletions(-)

Comments

Aviad Yehezkel Oct. 15, 2017, 12:56 p.m. UTC | #1 
On 10/14/2017 4:28 PM, aviadye@dev.mellanox.co.il wrote:
> From: Aviad Yehezkel <aviadye@mellanox.com>
>
> Signed-off-by: Aviad Yehezkel <aviadye@mellanox.com>
> Signed-off-by: Nicolai Radu <radu.nicolai@intel.com>
> ---
>   app/test-pmd/cmdline.c | 13 ++++++++++---
>   app/test-pmd/config.c  | 12 +++++++++++-
>   2 files changed, 21 insertions(+), 4 deletions(-)
>
> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
> index bb19d72..e4a636e 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -7377,11 +7377,17 @@ struct cmd_set_vf_rxmode {
>   };
>   
>   static void
> -cmd_set_vf_rxmode_parsed(void *parsed_result,
> -		       __attribute__((unused)) struct cmdline *cl,
> -		       __attribute__((unused)) void *data)
> +cmd_set_vf_rxmode_parsed(
> +#if defined(RTE_LIBRTE_IXGBE_PMD) || defined(RTE_LIBRTE_BNXT_PMD)
> +		void *parsed_result,
> +#else
> +		__attribute__((unused)) void *parsed_result,
> +#endif
> +		__attribute__((unused)) struct cmdline *cl,
> +		__attribute__((unused)) void *data)
>   {
>   	int ret = -ENOTSUP;
> +#if defined(RTE_LIBRTE_IXGBE_PMD) || defined(RTE_LIBRTE_BNXT_PMD)
>   	uint16_t rx_mode = 0;
>   	struct cmd_set_vf_rxmode *res = parsed_result;
>   
> @@ -7396,6 +7402,7 @@ cmd_set_vf_rxmode_parsed(void *parsed_result,
>   		else if (!strncmp(res->mode, "MPE",3))
>   			rx_mode |= ETH_VMDQ_ACCEPT_MULTICAST;
>   	}
> +#endif
>   
>   #ifdef RTE_LIBRTE_IXGBE_PMD
>   	if (ret == -ENOTSUP)
> diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
> index bafe76c..d38ba82 100644
> --- a/app/test-pmd/config.c
> +++ b/app/test-pmd/config.c
> @@ -3181,7 +3181,17 @@ set_queue_rate_limit(portid_t port_id, uint16_t queue_idx, uint16_t rate)
>   }
>   
>   int
> -set_vf_rate_limit(portid_t port_id, uint16_t vf, uint16_t rate, uint64_t q_msk)
> +set_vf_rate_limit(
> +		portid_t port_id,
> +#if defined(RTE_LIBRTE_IXGBE_PMD) || defined(RTE_LIBRTE_BNXT_PMD)
> +		uint16_t vf,
> +		uint16_t rate,
> +		uint64_t q_msk)
> +#else
> +		__attribute__((unused)) uint16_t vf,
> +		__attribute__((unused)) uint16_t rate,
> +		__attribute__((unused)) uint64_t q_msk)
> +#endif
>   {
>   	int diag = -ENOTSUP;
>   

Tested-by: Aviad Yehezkel <aviadye@mellanox.com>
Sergio Gonzalez Monroy Oct. 16, 2017, 9:44 a.m. UTC | #2 
On 14/10/2017 14:28, aviadye@dev.mellanox.co.il wrote:
> From: Aviad Yehezkel <aviadye@mellanox.com>
>
> Signed-off-by: Aviad Yehezkel <aviadye@mellanox.com>
> Signed-off-by: Nicolai Radu <radu.nicolai@intel.com>
> ---
>   app/test-pmd/cmdline.c | 13 ++++++++++---
>   app/test-pmd/config.c  | 12 +++++++++++-
>   2 files changed, 21 insertions(+), 4 deletions(-)

This patch is modifying a different app, should be on its own.

Thanks,
Sergio

> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
> index bb19d72..e4a636e 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -7377,11 +7377,17 @@ struct cmd_set_vf_rxmode {
>   };
>   
>   static void
> -cmd_set_vf_rxmode_parsed(void *parsed_result,
> -		       __attribute__((unused)) struct cmdline *cl,
> -		       __attribute__((unused)) void *data)
> +cmd_set_vf_rxmode_parsed(
> +#if defined(RTE_LIBRTE_IXGBE_PMD) || defined(RTE_LIBRTE_BNXT_PMD)
> +		void *parsed_result,
> +#else
> +		__attribute__((unused)) void *parsed_result,
> +#endif
> +		__attribute__((unused)) struct cmdline *cl,
> +		__attribute__((unused)) void *data)
>   {
>   	int ret = -ENOTSUP;
> +#if defined(RTE_LIBRTE_IXGBE_PMD) || defined(RTE_LIBRTE_BNXT_PMD)
>   	uint16_t rx_mode = 0;
>   	struct cmd_set_vf_rxmode *res = parsed_result;
>   
> @@ -7396,6 +7402,7 @@ cmd_set_vf_rxmode_parsed(void *parsed_result,
>   		else if (!strncmp(res->mode, "MPE",3))
>   			rx_mode |= ETH_VMDQ_ACCEPT_MULTICAST;
>   	}
> +#endif
>   
>   #ifdef RTE_LIBRTE_IXGBE_PMD
>   	if (ret == -ENOTSUP)
> diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
> index bafe76c..d38ba82 100644
> --- a/app/test-pmd/config.c
> +++ b/app/test-pmd/config.c
> @@ -3181,7 +3181,17 @@ set_queue_rate_limit(portid_t port_id, uint16_t queue_idx, uint16_t rate)
>   }
>   
>   int
> -set_vf_rate_limit(portid_t port_id, uint16_t vf, uint16_t rate, uint64_t q_msk)
> +set_vf_rate_limit(
> +		portid_t port_id,
> +#if defined(RTE_LIBRTE_IXGBE_PMD) || defined(RTE_LIBRTE_BNXT_PMD)
> +		uint16_t vf,
> +		uint16_t rate,
> +		uint64_t q_msk)
> +#else
> +		__attribute__((unused)) uint16_t vf,
> +		__attribute__((unused)) uint16_t rate,
> +		__attribute__((unused)) uint64_t q_msk)
> +#endif
>   {
>   	int diag = -ENOTSUP;
>
Aviad Yehezkel Oct. 16, 2017, 10:38 a.m. UTC | #3 
On 10/16/2017 12:44 PM, Sergio Gonzalez Monroy wrote:
> On 14/10/2017 14:28, aviadye@dev.mellanox.co.il wrote:
>> From: Aviad Yehezkel <aviadye@mellanox.com>
>>
>> Signed-off-by: Aviad Yehezkel <aviadye@mellanox.com>
>> Signed-off-by: Nicolai Radu <radu.nicolai@intel.com>
>> ---
>>   app/test-pmd/cmdline.c | 13 ++++++++++---
>>   app/test-pmd/config.c  | 12 +++++++++++-
>>   2 files changed, 21 insertions(+), 4 deletions(-)
>
> This patch is modifying a different app, should be on its own.
>
> Thanks,
> Sergio
Agreed. Will send as different patch in next version with fixes.

Thanks,
Aviad.


>> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
>> index bb19d72..e4a636e 100644
>> --- a/app/test-pmd/cmdline.c
>> +++ b/app/test-pmd/cmdline.c
>> @@ -7377,11 +7377,17 @@ struct cmd_set_vf_rxmode {
>>   };
>>     static void
>> -cmd_set_vf_rxmode_parsed(void *parsed_result,
>> -               __attribute__((unused)) struct cmdline *cl,
>> -               __attribute__((unused)) void *data)
>> +cmd_set_vf_rxmode_parsed(
>> +#if defined(RTE_LIBRTE_IXGBE_PMD) || defined(RTE_LIBRTE_BNXT_PMD)
>> +        void *parsed_result,
>> +#else
>> +        __attribute__((unused)) void *parsed_result,
>> +#endif
>> +        __attribute__((unused)) struct cmdline *cl,
>> +        __attribute__((unused)) void *data)
>>   {
>>       int ret = -ENOTSUP;
>> +#if defined(RTE_LIBRTE_IXGBE_PMD) || defined(RTE_LIBRTE_BNXT_PMD)
>>       uint16_t rx_mode = 0;
>>       struct cmd_set_vf_rxmode *res = parsed_result;
>>   @@ -7396,6 +7402,7 @@ cmd_set_vf_rxmode_parsed(void *parsed_result,
>>           else if (!strncmp(res->mode, "MPE",3))
>>               rx_mode |= ETH_VMDQ_ACCEPT_MULTICAST;
>>       }
>> +#endif
>>     #ifdef RTE_LIBRTE_IXGBE_PMD
>>       if (ret == -ENOTSUP)
>> diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
>> index bafe76c..d38ba82 100644
>> --- a/app/test-pmd/config.c
>> +++ b/app/test-pmd/config.c
>> @@ -3181,7 +3181,17 @@ set_queue_rate_limit(portid_t port_id, 
>> uint16_t queue_idx, uint16_t rate)
>>   }
>>     int
>> -set_vf_rate_limit(portid_t port_id, uint16_t vf, uint16_t rate, 
>> uint64_t q_msk)
>> +set_vf_rate_limit(
>> +        portid_t port_id,
>> +#if defined(RTE_LIBRTE_IXGBE_PMD) || defined(RTE_LIBRTE_BNXT_PMD)
>> +        uint16_t vf,
>> +        uint16_t rate,
>> +        uint64_t q_msk)
>> +#else
>> +        __attribute__((unused)) uint16_t vf,
>> +        __attribute__((unused)) uint16_t rate,
>> +        __attribute__((unused)) uint64_t q_msk)
>> +#endif
>>   {
>>       int diag = -ENOTSUP;
>
>
diff mbox

Patch

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index bb19d72..e4a636e 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -7377,11 +7377,17 @@  struct cmd_set_vf_rxmode {
 };
 
 static void
-cmd_set_vf_rxmode_parsed(void *parsed_result,
-		       __attribute__((unused)) struct cmdline *cl,
-		       __attribute__((unused)) void *data)
+cmd_set_vf_rxmode_parsed(
+#if defined(RTE_LIBRTE_IXGBE_PMD) || defined(RTE_LIBRTE_BNXT_PMD)
+		void *parsed_result,
+#else
+		__attribute__((unused)) void *parsed_result,
+#endif
+		__attribute__((unused)) struct cmdline *cl,
+		__attribute__((unused)) void *data)
 {
 	int ret = -ENOTSUP;
+#if defined(RTE_LIBRTE_IXGBE_PMD) || defined(RTE_LIBRTE_BNXT_PMD)
 	uint16_t rx_mode = 0;
 	struct cmd_set_vf_rxmode *res = parsed_result;
 
@@ -7396,6 +7402,7 @@  cmd_set_vf_rxmode_parsed(void *parsed_result,
 		else if (!strncmp(res->mode, "MPE",3))
 			rx_mode |= ETH_VMDQ_ACCEPT_MULTICAST;
 	}
+#endif
 
 #ifdef RTE_LIBRTE_IXGBE_PMD
 	if (ret == -ENOTSUP)
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index bafe76c..d38ba82 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -3181,7 +3181,17 @@  set_queue_rate_limit(portid_t port_id, uint16_t queue_idx, uint16_t rate)
 }
 
 int
-set_vf_rate_limit(portid_t port_id, uint16_t vf, uint16_t rate, uint64_t q_msk)
+set_vf_rate_limit(
+		portid_t port_id,
+#if defined(RTE_LIBRTE_IXGBE_PMD) || defined(RTE_LIBRTE_BNXT_PMD)
+		uint16_t vf,
+		uint16_t rate,
+		uint64_t q_msk)
+#else
+		__attribute__((unused)) uint16_t vf,
+		__attribute__((unused)) uint16_t rate,
+		__attribute__((unused)) uint64_t q_msk)
+#endif
 {
 	int diag = -ENOTSUP;