Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/112309

_apply patch failure_

Submitter: Sunil Kumar Kori <skori@marvell.com>
Date: Friday, June 03 2022 13:06:27 
Applied on: CommitID:769723eef91c8f47cdf851df5fa97dca7ccbbbe2
Apply patch set 112309 failed:

Checking patch app/test-pmd/cmdline.c...
Hunk #1 succeeded at 17970 (offset -24 lines).
Checking patch app/test-pmd/cmdline_mtr.c...
error: while searching for:
static cmdline_parse_token_num_t cmd_create_port_meter_shared =
	TOKEN_NUM_INITIALIZER(struct cmd_create_port_meter_result,
		shared, RTE_UINT32);
static cmdline_parse_token_string_t cmd_create_port_meter_input_color =
	TOKEN_STRING_INITIALIZER(struct cmd_create_port_meter_result,
		meter_input_color, TOKEN_STRING_MULTI);

error: patch failed: app/test-pmd/cmdline_mtr.c:754
Hunk #9 succeeded at 960 (offset 6 lines).
Hunk #10 succeeded at 974 (offset 6 lines).
Hunk #11 succeeded at 993 (offset 6 lines).
error: while searching for:
	.f = cmd_create_port_meter_parsed,
	.data = NULL,
	.help_str = "create port meter <port_id> <mtr_id> <profile_id> <policy_id> "
		"<meter_enable>(yes|no) <stats_mask> <shared> <use_pre_meter_color> "
		"[<dscp_tbl_entry0> <dscp_tbl_entry1> ...<dscp_tbl_entry63>]",
	.tokens = {
		(void *)&cmd_create_port_meter_create,
		(void *)&cmd_create_port_meter_port,

error: patch failed: app/test-pmd/cmdline_mtr.c:809
Hunk #13 succeeded at 1030 (offset 4 lines).
Hunk #14 succeeded at 1433 (offset 4 lines).
Checking patch app/test-pmd/cmdline_mtr.h...
Applied patch app/test-pmd/cmdline.c cleanly.
Applying patch app/test-pmd/cmdline_mtr.c with 2 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Hunk #7 applied cleanly.
Rejected hunk #8.
Hunk #9 applied cleanly.
Hunk #10 applied cleanly.
Hunk #11 applied cleanly.
Rejected hunk #12.
Hunk #13 applied cleanly.
Hunk #14 applied cleanly.
Applied patch app/test-pmd/cmdline_mtr.h cleanly.
diff a/app/test-pmd/cmdline_mtr.c b/app/test-pmd/cmdline_mtr.c	(rejected hunks)
@@ -754,6 +936,9 @@ static cmdline_parse_token_num_t cmd_create_port_meter_statistics_mask =
 static cmdline_parse_token_num_t cmd_create_port_meter_shared =
 	TOKEN_NUM_INITIALIZER(struct cmd_create_port_meter_result,
 		shared, RTE_UINT32);
+static cmdline_parse_token_string_t cmd_create_port_meter_default_input_color =
+	TOKEN_STRING_INITIALIZER(struct cmd_create_port_meter_result,
+		default_input_color, "R#Y#G#r#y#g");
 static cmdline_parse_token_string_t cmd_create_port_meter_input_color =
 	TOKEN_STRING_INITIALIZER(struct cmd_create_port_meter_result,
 		meter_input_color, TOKEN_STRING_MULTI);
@@ -809,8 +1011,10 @@ cmdline_parse_inst_t cmd_create_port_meter = {
 	.f = cmd_create_port_meter_parsed,
 	.data = NULL,
 	.help_str = "create port meter <port_id> <mtr_id> <profile_id> <policy_id> "
-		"<meter_enable>(yes|no) <stats_mask> <shared> <use_pre_meter_color> "
-		"[<dscp_tbl_entry0> <dscp_tbl_entry1> ...<dscp_tbl_entry63>]",
+		"<meter_enable>(yes|no) <stats_mask> <shared> "
+		"<default_input_color>(g|y|r) <use_pre_meter_color> "
+		"[<dscp_tbl_entry0> <dscp_tbl_entry1> ...<dscp_tbl_entry63>] "
+		"[<vlan_tbl_entry0> <vlan_tbl_entry1> ... <vlan_tbl_entry16>]",
 	.tokens = {
 		(void *)&cmd_create_port_meter_create,
 		(void *)&cmd_create_port_meter_port,

https://lab.dpdk.org/results/dashboard/patchsets/22424/

UNH-IOL DPDK Community Lab