[dpdk-stable] patch 'app/testpmd: fix identifier size for port attach' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/29/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From e09cfe4dfedf417770c52776b990f32b7af3c4ab Mon Sep 17 00:00:00 2001
From: Wisam Jaddo <wisamm at mellanox.com>
Date: Wed, 19 Feb 2020 18:47:30 +0200
Subject: [PATCH] app/testpmd: fix identifier size for port attach

[ upstream commit f1cfa5687f2c7641e89cba60d1c2fb774e591cc7 ]

Identifier for new port may contain white list options,
and white list options will not fit into 128 from STR_TOKEN_SIZE,
instead having 4096 char from STR_MULTI_TOKEN_SIZE will provide
better and more options

Fixes: edab33b1c01d ("app/testpmd: support port hotplug")

Signed-off-by: Wisam Jaddo <wisamm at mellanox.com>
Acked-by: Bernard Iremonger <bernard.iremonger at intel.com>
---
 app/test-pmd/cmdline.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index f287deaf7c..f01cf31f70 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -1437,7 +1437,7 @@ cmdline_parse_inst_t cmd_set_port_setup_on = {
 struct cmd_operate_attach_port_result {
 	cmdline_fixed_string_t port;
 	cmdline_fixed_string_t keyword;
-	cmdline_fixed_string_t identifier;
+	cmdline_multi_string_t identifier;
 };
 
 static void cmd_operate_attach_port_parsed(void *parsed_result,
@@ -1460,7 +1460,7 @@ cmdline_parse_token_string_t cmd_operate_attach_port_keyword =
 			keyword, "attach");
 cmdline_parse_token_string_t cmd_operate_attach_port_identifier =
 	TOKEN_STRING_INITIALIZER(struct cmd_operate_attach_port_result,
-			identifier, NULL);
+			identifier, TOKEN_STRING_MULTI);
 
 cmdline_parse_inst_t cmd_operate_attach_port = {
 	.f = cmd_operate_attach_port_parsed,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-27 09:31:56.685649100 +0000
+++ 0027-app-testpmd-fix-identifier-size-for-port-attach.patch	2020-02-27 09:31:55.775946166 +0000
@@ -1,15 +1,16 @@
-From f1cfa5687f2c7641e89cba60d1c2fb774e591cc7 Mon Sep 17 00:00:00 2001
+From e09cfe4dfedf417770c52776b990f32b7af3c4ab Mon Sep 17 00:00:00 2001
 From: Wisam Jaddo <wisamm at mellanox.com>
 Date: Wed, 19 Feb 2020 18:47:30 +0200
 Subject: [PATCH] app/testpmd: fix identifier size for port attach
 
+[ upstream commit f1cfa5687f2c7641e89cba60d1c2fb774e591cc7 ]
+
 Identifier for new port may contain white list options,
 and white list options will not fit into 128 from STR_TOKEN_SIZE,
 instead having 4096 char from STR_MULTI_TOKEN_SIZE will provide
 better and more options
 
 Fixes: edab33b1c01d ("app/testpmd: support port hotplug")
-Cc: stable at dpdk.org
 
 Signed-off-by: Wisam Jaddo <wisamm at mellanox.com>
 Acked-by: Bernard Iremonger <bernard.iremonger at intel.com>
@@ -18,10 +19,10 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
-index 38b6d804c6..a037a55c6a 100644
+index f287deaf7c..f01cf31f70 100644
 --- a/app/test-pmd/cmdline.c
 +++ b/app/test-pmd/cmdline.c
-@@ -1446,7 +1446,7 @@ cmdline_parse_inst_t cmd_set_port_setup_on = {
+@@ -1437,7 +1437,7 @@ cmdline_parse_inst_t cmd_set_port_setup_on = {
  struct cmd_operate_attach_port_result {
  	cmdline_fixed_string_t port;
  	cmdline_fixed_string_t keyword;
@@ -30,7 +31,7 @@
  };
  
  static void cmd_operate_attach_port_parsed(void *parsed_result,
-@@ -1469,7 +1469,7 @@ cmdline_parse_token_string_t cmd_operate_attach_port_keyword =
+@@ -1460,7 +1460,7 @@ cmdline_parse_token_string_t cmd_operate_attach_port_keyword =
  			keyword, "attach");
  cmdline_parse_token_string_t cmd_operate_attach_port_identifier =
  	TOKEN_STRING_INITIALIZER(struct cmd_operate_attach_port_result,