net/ena: fix build with GCC 12
[dpdk.git] / app / test-pmd / cmdline_tm.c
index af99880..fb56a23 100644 (file)
@@ -69,7 +69,7 @@ print_err_msg(struct rte_tm_error *error)
                [RTE_TM_ERROR_TYPE_NODE_PARAMS_N_SHARED_SHAPERS]
                        = "num shared shapers field (node params)",
                [RTE_TM_ERROR_TYPE_NODE_PARAMS_WFQ_WEIGHT_MODE]
-                       = "wfq weght mode field (node params)",
+                       = "wfq weight mode field (node params)",
                [RTE_TM_ERROR_TYPE_NODE_PARAMS_N_SP_PRIORITIES]
                        = "num strict priorities field (node params)",
                [RTE_TM_ERROR_TYPE_NODE_PARAMS_CMAN]
@@ -97,7 +97,8 @@ print_err_msg(struct rte_tm_error *error)
        if (error->cause)
                snprintf(buf, sizeof(buf), "cause: %p, ", error->cause);
 
-       printf("%s: %s%s (error %d)\n", errstr, error->cause ? buf : "",
+       fprintf(stderr, "%s: %s%s (error %d)\n",
+               errstr, error->cause ? buf : "",
                error->message ? error->message : "(no stated reason)",
                error->type);
 }
@@ -174,7 +175,8 @@ parse_multi_ss_id_str(char *s_str, uint32_t *n_ssp, uint32_t shaper_id[])
 
        /* Check: num of shared shaper */
        if (n_shared_shapers >= MAX_NUM_SHARED_SHAPERS) {
-               printf(" Number of shared shapers exceed the max (error)\n");
+               fprintf(stderr,
+                       " Number of shared shapers exceed the max (error)\n");
                return -1;
        }
 
@@ -205,21 +207,21 @@ struct cmd_show_port_tm_cap_result {
        uint16_t port_id;
 };
 
-cmdline_parse_token_string_t cmd_show_port_tm_cap_show =
+static cmdline_parse_token_string_t cmd_show_port_tm_cap_show =
        TOKEN_STRING_INITIALIZER(struct cmd_show_port_tm_cap_result,
                show, "show");
-cmdline_parse_token_string_t cmd_show_port_tm_cap_port =
+static cmdline_parse_token_string_t cmd_show_port_tm_cap_port =
        TOKEN_STRING_INITIALIZER(struct cmd_show_port_tm_cap_result,
                port, "port");
-cmdline_parse_token_string_t cmd_show_port_tm_cap_tm =
+static cmdline_parse_token_string_t cmd_show_port_tm_cap_tm =
        TOKEN_STRING_INITIALIZER(struct cmd_show_port_tm_cap_result,
                tm, "tm");
-cmdline_parse_token_string_t cmd_show_port_tm_cap_cap =
+static cmdline_parse_token_string_t cmd_show_port_tm_cap_cap =
        TOKEN_STRING_INITIALIZER(struct cmd_show_port_tm_cap_result,
                cap, "cap");
-cmdline_parse_token_num_t cmd_show_port_tm_cap_port_id =
+static cmdline_parse_token_num_t cmd_show_port_tm_cap_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_cap_result,
-                port_id, UINT16);
+                port_id, RTE_UINT16);
 
 static void cmd_show_port_tm_cap_parsed(void *parsed_result,
        __rte_unused struct cmdline *cl,
@@ -351,27 +353,27 @@ struct cmd_show_port_tm_level_cap_result {
        uint32_t level_id;
 };
 
-cmdline_parse_token_string_t cmd_show_port_tm_level_cap_show =
+static cmdline_parse_token_string_t cmd_show_port_tm_level_cap_show =
        TOKEN_STRING_INITIALIZER(struct cmd_show_port_tm_level_cap_result,
                show, "show");
-cmdline_parse_token_string_t cmd_show_port_tm_level_cap_port =
+static cmdline_parse_token_string_t cmd_show_port_tm_level_cap_port =
        TOKEN_STRING_INITIALIZER(struct cmd_show_port_tm_level_cap_result,
                port, "port");
-cmdline_parse_token_string_t cmd_show_port_tm_level_cap_tm =
+static cmdline_parse_token_string_t cmd_show_port_tm_level_cap_tm =
        TOKEN_STRING_INITIALIZER(struct cmd_show_port_tm_level_cap_result,
                tm, "tm");
-cmdline_parse_token_string_t cmd_show_port_tm_level_cap_level =
+static cmdline_parse_token_string_t cmd_show_port_tm_level_cap_level =
        TOKEN_STRING_INITIALIZER(struct cmd_show_port_tm_level_cap_result,
                level, "level");
-cmdline_parse_token_string_t cmd_show_port_tm_level_cap_cap =
+static cmdline_parse_token_string_t cmd_show_port_tm_level_cap_cap =
        TOKEN_STRING_INITIALIZER(struct cmd_show_port_tm_level_cap_result,
                cap, "cap");
-cmdline_parse_token_num_t cmd_show_port_tm_level_cap_port_id =
+static cmdline_parse_token_num_t cmd_show_port_tm_level_cap_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_level_cap_result,
-                port_id, UINT16);
-cmdline_parse_token_num_t cmd_show_port_tm_level_cap_level_id =
+                port_id, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_show_port_tm_level_cap_level_id =
        TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_level_cap_result,
-                level_id, UINT32);
+                level_id, RTE_UINT32);
 
 
 static void cmd_show_port_tm_level_cap_parsed(void *parsed_result,
@@ -477,7 +479,7 @@ static void cmd_show_port_tm_level_cap_parsed(void *parsed_result,
 cmdline_parse_inst_t cmd_show_port_tm_level_cap = {
        .f = cmd_show_port_tm_level_cap_parsed,
        .data = NULL,
-       .help_str = "Show Port TM Hierarhical level Capabilities",
+       .help_str = "Show port TM hierarchical level capabilities",
        .tokens = {
                (void *)&cmd_show_port_tm_level_cap_show,
                (void *)&cmd_show_port_tm_level_cap_port,
@@ -501,27 +503,27 @@ struct cmd_show_port_tm_node_cap_result {
        uint32_t node_id;
 };
 
-cmdline_parse_token_string_t cmd_show_port_tm_node_cap_show =
+static cmdline_parse_token_string_t cmd_show_port_tm_node_cap_show =
        TOKEN_STRING_INITIALIZER(struct cmd_show_port_tm_node_cap_result,
                show, "show");
-cmdline_parse_token_string_t cmd_show_port_tm_node_cap_port =
+static cmdline_parse_token_string_t cmd_show_port_tm_node_cap_port =
        TOKEN_STRING_INITIALIZER(struct cmd_show_port_tm_node_cap_result,
                port, "port");
-cmdline_parse_token_string_t cmd_show_port_tm_node_cap_tm =
+static cmdline_parse_token_string_t cmd_show_port_tm_node_cap_tm =
        TOKEN_STRING_INITIALIZER(struct cmd_show_port_tm_node_cap_result,
                tm, "tm");
-cmdline_parse_token_string_t cmd_show_port_tm_node_cap_node =
+static cmdline_parse_token_string_t cmd_show_port_tm_node_cap_node =
        TOKEN_STRING_INITIALIZER(struct cmd_show_port_tm_node_cap_result,
                node, "node");
-cmdline_parse_token_string_t cmd_show_port_tm_node_cap_cap =
+static cmdline_parse_token_string_t cmd_show_port_tm_node_cap_cap =
        TOKEN_STRING_INITIALIZER(struct cmd_show_port_tm_node_cap_result,
                cap, "cap");
-cmdline_parse_token_num_t cmd_show_port_tm_node_cap_port_id =
+static cmdline_parse_token_num_t cmd_show_port_tm_node_cap_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_node_cap_result,
-                port_id, UINT16);
-cmdline_parse_token_num_t cmd_show_port_tm_node_cap_node_id =
+                port_id, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_show_port_tm_node_cap_node_id =
        TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_node_cap_result,
-                node_id, UINT32);
+                node_id, RTE_UINT32);
 
 static void cmd_show_port_tm_node_cap_parsed(void *parsed_result,
        __rte_unused struct cmdline *cl,
@@ -625,31 +627,31 @@ struct cmd_show_port_tm_node_stats_result {
        uint32_t clear;
 };
 
-cmdline_parse_token_string_t cmd_show_port_tm_node_stats_show =
+static cmdline_parse_token_string_t cmd_show_port_tm_node_stats_show =
        TOKEN_STRING_INITIALIZER(
                struct cmd_show_port_tm_node_stats_result, show, "show");
-cmdline_parse_token_string_t cmd_show_port_tm_node_stats_port =
+static cmdline_parse_token_string_t cmd_show_port_tm_node_stats_port =
        TOKEN_STRING_INITIALIZER(
                struct cmd_show_port_tm_node_stats_result, port, "port");
-cmdline_parse_token_string_t cmd_show_port_tm_node_stats_tm =
+static cmdline_parse_token_string_t cmd_show_port_tm_node_stats_tm =
        TOKEN_STRING_INITIALIZER(
                struct cmd_show_port_tm_node_stats_result, tm, "tm");
-cmdline_parse_token_string_t cmd_show_port_tm_node_stats_node =
+static cmdline_parse_token_string_t cmd_show_port_tm_node_stats_node =
        TOKEN_STRING_INITIALIZER(
                struct cmd_show_port_tm_node_stats_result, node, "node");
-cmdline_parse_token_string_t cmd_show_port_tm_node_stats_stats =
+static cmdline_parse_token_string_t cmd_show_port_tm_node_stats_stats =
        TOKEN_STRING_INITIALIZER(
                struct cmd_show_port_tm_node_stats_result, stats, "stats");
-cmdline_parse_token_num_t cmd_show_port_tm_node_stats_port_id =
+static cmdline_parse_token_num_t cmd_show_port_tm_node_stats_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_show_port_tm_node_stats_result,
-                       port_id, UINT16);
-cmdline_parse_token_num_t cmd_show_port_tm_node_stats_node_id =
+                       port_id, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_show_port_tm_node_stats_node_id =
        TOKEN_NUM_INITIALIZER(
                struct cmd_show_port_tm_node_stats_result,
-                       node_id, UINT32);
-cmdline_parse_token_num_t cmd_show_port_tm_node_stats_clear =
+                       node_id, RTE_UINT32);
+static cmdline_parse_token_num_t cmd_show_port_tm_node_stats_clear =
        TOKEN_NUM_INITIALIZER(
-               struct cmd_show_port_tm_node_stats_result, clear, UINT32);
+               struct cmd_show_port_tm_node_stats_result, clear, RTE_UINT32);
 
 static void cmd_show_port_tm_node_stats_parsed(void *parsed_result,
        __rte_unused struct cmdline *cl,
@@ -670,7 +672,7 @@ static void cmd_show_port_tm_node_stats_parsed(void *parsed_result,
        memset(&error, 0, sizeof(struct rte_tm_error));
        /* Port status */
        if (!port_is_started(port_id)) {
-               printf(" Port %u not started (error)\n", port_id);
+               fprintf(stderr, " Port %u not started (error)\n", port_id);
                return;
        }
 
@@ -743,29 +745,29 @@ struct cmd_show_port_tm_node_type_result {
        uint32_t node_id;
 };
 
-cmdline_parse_token_string_t cmd_show_port_tm_node_type_show =
+static cmdline_parse_token_string_t cmd_show_port_tm_node_type_show =
        TOKEN_STRING_INITIALIZER(
                struct cmd_show_port_tm_node_type_result, show, "show");
-cmdline_parse_token_string_t cmd_show_port_tm_node_type_port =
+static cmdline_parse_token_string_t cmd_show_port_tm_node_type_port =
        TOKEN_STRING_INITIALIZER(
                struct cmd_show_port_tm_node_type_result, port, "port");
-cmdline_parse_token_string_t cmd_show_port_tm_node_type_tm =
+static cmdline_parse_token_string_t cmd_show_port_tm_node_type_tm =
        TOKEN_STRING_INITIALIZER(
                struct cmd_show_port_tm_node_type_result, tm, "tm");
-cmdline_parse_token_string_t cmd_show_port_tm_node_type_node =
+static cmdline_parse_token_string_t cmd_show_port_tm_node_type_node =
        TOKEN_STRING_INITIALIZER(
                struct cmd_show_port_tm_node_type_result, node, "node");
-cmdline_parse_token_string_t cmd_show_port_tm_node_type_type =
+static cmdline_parse_token_string_t cmd_show_port_tm_node_type_type =
        TOKEN_STRING_INITIALIZER(
                struct cmd_show_port_tm_node_type_result, type, "type");
-cmdline_parse_token_num_t cmd_show_port_tm_node_type_port_id =
+static cmdline_parse_token_num_t cmd_show_port_tm_node_type_port_id =
        TOKEN_NUM_INITIALIZER(
                struct cmd_show_port_tm_node_type_result,
-                       port_id, UINT16);
-cmdline_parse_token_num_t cmd_show_port_tm_node_type_node_id =
+                       port_id, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_show_port_tm_node_type_node_id =
        TOKEN_NUM_INITIALIZER(
                struct cmd_show_port_tm_node_type_result,
-                       node_id, UINT32);
+                       node_id, RTE_UINT32);
 
 static void cmd_show_port_tm_node_type_parsed(void *parsed_result,
        __rte_unused struct cmdline *cl,
@@ -828,61 +830,61 @@ struct cmd_add_port_tm_node_shaper_profile_result {
        int pkt_mode;
 };
 
-cmdline_parse_token_string_t cmd_add_port_tm_node_shaper_profile_add =
+static cmdline_parse_token_string_t cmd_add_port_tm_node_shaper_profile_add =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_node_shaper_profile_result, add, "add");
-cmdline_parse_token_string_t cmd_add_port_tm_node_shaper_profile_port =
+static cmdline_parse_token_string_t cmd_add_port_tm_node_shaper_profile_port =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_node_shaper_profile_result,
                        port, "port");
-cmdline_parse_token_string_t cmd_add_port_tm_node_shaper_profile_tm =
+static cmdline_parse_token_string_t cmd_add_port_tm_node_shaper_profile_tm =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_node_shaper_profile_result,
                        tm, "tm");
-cmdline_parse_token_string_t cmd_add_port_tm_node_shaper_profile_node =
+static cmdline_parse_token_string_t cmd_add_port_tm_node_shaper_profile_node =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_node_shaper_profile_result,
                        node, "node");
-cmdline_parse_token_string_t cmd_add_port_tm_node_shaper_profile_shaper =
+static cmdline_parse_token_string_t cmd_add_port_tm_node_shaper_profile_shaper =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_node_shaper_profile_result,
                        shaper, "shaper");
-cmdline_parse_token_string_t cmd_add_port_tm_node_shaper_profile_profile =
+static cmdline_parse_token_string_t cmd_add_port_tm_node_shaper_profile_profile =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_node_shaper_profile_result,
                        profile, "profile");
-cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_port_id =
+static cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_port_id =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_shaper_profile_result,
-                       port_id, UINT16);
-cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_shaper_id =
+                       port_id, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_shaper_id =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_shaper_profile_result,
-                       shaper_id, UINT32);
-cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_cmit_tb_rate =
+                       shaper_id, RTE_UINT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_cmit_tb_rate =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_shaper_profile_result,
-                       cmit_tb_rate, UINT64);
-cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_cmit_tb_size =
+                       cmit_tb_rate, RTE_UINT64);
+static cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_cmit_tb_size =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_shaper_profile_result,
-                       cmit_tb_size, UINT64);
-cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_peak_tb_rate =
+                       cmit_tb_size, RTE_UINT64);
+static cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_peak_tb_rate =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_shaper_profile_result,
-                       peak_tb_rate, UINT64);
-cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_peak_tb_size =
+                       peak_tb_rate, RTE_UINT64);
+static cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_peak_tb_size =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_shaper_profile_result,
-                       peak_tb_size, UINT64);
-cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_pktlen_adjust =
+                       peak_tb_size, RTE_UINT64);
+static cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_pktlen_adjust =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_shaper_profile_result,
-                       pktlen_adjust, UINT32);
-cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_packet_mode =
+                       pktlen_adjust, RTE_UINT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_packet_mode =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_shaper_profile_result,
-                       pkt_mode, UINT32);
+                       pkt_mode, RTE_UINT32);
 
 static void cmd_add_port_tm_node_shaper_profile_parsed(void *parsed_result,
        __rte_unused struct cmdline *cl,
@@ -951,36 +953,36 @@ struct cmd_del_port_tm_node_shaper_profile_result {
        uint32_t shaper_id;
 };
 
-cmdline_parse_token_string_t cmd_del_port_tm_node_shaper_profile_del =
+static cmdline_parse_token_string_t cmd_del_port_tm_node_shaper_profile_del =
        TOKEN_STRING_INITIALIZER(
                struct cmd_del_port_tm_node_shaper_profile_result, del, "del");
-cmdline_parse_token_string_t cmd_del_port_tm_node_shaper_profile_port =
+static cmdline_parse_token_string_t cmd_del_port_tm_node_shaper_profile_port =
        TOKEN_STRING_INITIALIZER(
                struct cmd_del_port_tm_node_shaper_profile_result,
                        port, "port");
-cmdline_parse_token_string_t cmd_del_port_tm_node_shaper_profile_tm =
+static cmdline_parse_token_string_t cmd_del_port_tm_node_shaper_profile_tm =
        TOKEN_STRING_INITIALIZER(
                struct cmd_del_port_tm_node_shaper_profile_result, tm, "tm");
-cmdline_parse_token_string_t cmd_del_port_tm_node_shaper_profile_node =
+static cmdline_parse_token_string_t cmd_del_port_tm_node_shaper_profile_node =
        TOKEN_STRING_INITIALIZER(
                struct cmd_del_port_tm_node_shaper_profile_result,
                        node, "node");
-cmdline_parse_token_string_t cmd_del_port_tm_node_shaper_profile_shaper =
+static cmdline_parse_token_string_t cmd_del_port_tm_node_shaper_profile_shaper =
        TOKEN_STRING_INITIALIZER(
                struct cmd_del_port_tm_node_shaper_profile_result,
                        shaper, "shaper");
-cmdline_parse_token_string_t cmd_del_port_tm_node_shaper_profile_profile =
+static cmdline_parse_token_string_t cmd_del_port_tm_node_shaper_profile_profile =
        TOKEN_STRING_INITIALIZER(
                struct cmd_del_port_tm_node_shaper_profile_result,
                        profile, "profile");
-cmdline_parse_token_num_t cmd_del_port_tm_node_shaper_profile_port_id =
+static cmdline_parse_token_num_t cmd_del_port_tm_node_shaper_profile_port_id =
        TOKEN_NUM_INITIALIZER(
                struct cmd_del_port_tm_node_shaper_profile_result,
-                       port_id, UINT16);
-cmdline_parse_token_num_t cmd_del_port_tm_node_shaper_profile_shaper_id =
+                       port_id, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_del_port_tm_node_shaper_profile_shaper_id =
        TOKEN_NUM_INITIALIZER(
                struct cmd_del_port_tm_node_shaper_profile_result,
-                       shaper_id, UINT32);
+                       shaper_id, RTE_UINT32);
 
 static void cmd_del_port_tm_node_shaper_profile_parsed(void *parsed_result,
        __rte_unused struct cmdline *cl,
@@ -1033,39 +1035,39 @@ struct cmd_add_port_tm_node_shared_shaper_result {
        uint32_t shaper_profile_id;
 };
 
-cmdline_parse_token_string_t cmd_add_port_tm_node_shared_shaper_cmd_type =
+static cmdline_parse_token_string_t cmd_add_port_tm_node_shared_shaper_cmd_type =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_node_shared_shaper_result,
                        cmd_type, "add#set");
-cmdline_parse_token_string_t cmd_add_port_tm_node_shared_shaper_port =
+static cmdline_parse_token_string_t cmd_add_port_tm_node_shared_shaper_port =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_node_shared_shaper_result, port, "port");
-cmdline_parse_token_string_t cmd_add_port_tm_node_shared_shaper_tm =
+static cmdline_parse_token_string_t cmd_add_port_tm_node_shared_shaper_tm =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_node_shared_shaper_result, tm, "tm");
-cmdline_parse_token_string_t cmd_add_port_tm_node_shared_shaper_node =
+static cmdline_parse_token_string_t cmd_add_port_tm_node_shared_shaper_node =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_node_shared_shaper_result, node, "node");
-cmdline_parse_token_string_t cmd_add_port_tm_node_shared_shaper_shared =
+static cmdline_parse_token_string_t cmd_add_port_tm_node_shared_shaper_shared =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_node_shared_shaper_result,
                        shared, "shared");
-cmdline_parse_token_string_t cmd_add_port_tm_node_shared_shaper_shaper =
+static cmdline_parse_token_string_t cmd_add_port_tm_node_shared_shaper_shaper =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_node_shared_shaper_result,
                        shaper, "shaper");
-cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_port_id =
+static cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_port_id =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_shared_shaper_result,
-                       port_id, UINT16);
-cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_shared_shaper_id =
+                       port_id, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_shared_shaper_id =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_shared_shaper_result,
-                       shared_shaper_id, UINT32);
-cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_shaper_profile_id =
+                       shared_shaper_id, RTE_UINT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_node_shared_shaper_shaper_profile_id =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_shared_shaper_result,
-                       shaper_profile_id, UINT32);
+                       shaper_profile_id, RTE_UINT32);
 
 static void cmd_add_port_tm_node_shared_shaper_parsed(void *parsed_result,
        __rte_unused struct cmdline *cl,
@@ -1085,14 +1087,14 @@ static void cmd_add_port_tm_node_shared_shaper_parsed(void *parsed_result,
        /* Command type: add */
        if ((strcmp(res->cmd_type, "add") == 0) &&
                (port_is_started(port_id))) {
-               printf(" Port %u not stopped (error)\n", port_id);
+               fprintf(stderr, " Port %u not stopped (error)\n", port_id);
                return;
        }
 
        /* Command type: set (update) */
        if ((strcmp(res->cmd_type, "set") == 0) &&
                (!port_is_started(port_id))) {
-               printf(" Port %u not started (error)\n", port_id);
+               fprintf(stderr, " Port %u not started (error)\n", port_id);
                return;
        }
 
@@ -1134,34 +1136,34 @@ struct cmd_del_port_tm_node_shared_shaper_result {
        uint32_t shared_shaper_id;
 };
 
-cmdline_parse_token_string_t cmd_del_port_tm_node_shared_shaper_del =
+static cmdline_parse_token_string_t cmd_del_port_tm_node_shared_shaper_del =
        TOKEN_STRING_INITIALIZER(
                struct cmd_del_port_tm_node_shared_shaper_result, del, "del");
-cmdline_parse_token_string_t cmd_del_port_tm_node_shared_shaper_port =
+static cmdline_parse_token_string_t cmd_del_port_tm_node_shared_shaper_port =
        TOKEN_STRING_INITIALIZER(
                struct cmd_del_port_tm_node_shared_shaper_result, port, "port");
-cmdline_parse_token_string_t cmd_del_port_tm_node_shared_shaper_tm =
+static cmdline_parse_token_string_t cmd_del_port_tm_node_shared_shaper_tm =
        TOKEN_STRING_INITIALIZER(
                struct cmd_del_port_tm_node_shared_shaper_result, tm, "tm");
-cmdline_parse_token_string_t cmd_del_port_tm_node_shared_shaper_node =
+static cmdline_parse_token_string_t cmd_del_port_tm_node_shared_shaper_node =
        TOKEN_STRING_INITIALIZER(
                struct cmd_del_port_tm_node_shared_shaper_result, node, "node");
-cmdline_parse_token_string_t cmd_del_port_tm_node_shared_shaper_shared =
+static cmdline_parse_token_string_t cmd_del_port_tm_node_shared_shaper_shared =
        TOKEN_STRING_INITIALIZER(
                struct cmd_del_port_tm_node_shared_shaper_result,
                        shared, "shared");
-cmdline_parse_token_string_t cmd_del_port_tm_node_shared_shaper_shaper =
+static cmdline_parse_token_string_t cmd_del_port_tm_node_shared_shaper_shaper =
        TOKEN_STRING_INITIALIZER(
                struct cmd_del_port_tm_node_shared_shaper_result,
                        shaper, "shaper");
-cmdline_parse_token_num_t cmd_del_port_tm_node_shared_shaper_port_id =
+static cmdline_parse_token_num_t cmd_del_port_tm_node_shared_shaper_port_id =
        TOKEN_NUM_INITIALIZER(
                struct cmd_del_port_tm_node_shared_shaper_result,
-                       port_id, UINT16);
-cmdline_parse_token_num_t cmd_del_port_tm_node_shared_shaper_shared_shaper_id =
+                       port_id, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_del_port_tm_node_shared_shaper_shared_shaper_id =
        TOKEN_NUM_INITIALIZER(
                struct cmd_del_port_tm_node_shared_shaper_result,
-                       shared_shaper_id, UINT32);
+                       shared_shaper_id, RTE_UINT32);
 
 static void cmd_del_port_tm_node_shared_shaper_parsed(void *parsed_result,
        __rte_unused struct cmdline *cl,
@@ -1228,93 +1230,93 @@ struct cmd_add_port_tm_node_wred_profile_result {
        uint16_t wq_log2_r;
 };
 
-cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_add =
+static cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_add =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_node_wred_profile_result, add, "add");
-cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_port =
+static cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_port =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_node_wred_profile_result, port, "port");
-cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_tm =
+static cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_tm =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_node_wred_profile_result, tm, "tm");
-cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_node =
+static cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_node =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_node_wred_profile_result, node, "node");
-cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_wred =
+static cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_wred =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_node_wred_profile_result, wred, "wred");
-cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_profile =
+static cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_profile =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_node_wred_profile_result,
                        profile, "profile");
-cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_port_id =
+static cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_port_id =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_wred_profile_result,
-                       port_id, UINT16);
-cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wred_profile_id =
+                       port_id, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wred_profile_id =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_wred_profile_result,
-                       wred_profile_id, UINT32);
-cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_g =
+                       wred_profile_id, RTE_UINT32);
+static cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_g =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_node_wred_profile_result,
                        color_g, "G#g");
-cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_g =
+static cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_g =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_wred_profile_result,
-                       min_th_g, UINT64);
-cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_g =
+                       min_th_g, RTE_UINT64);
+static cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_g =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_wred_profile_result,
-                       max_th_g, UINT64);
-cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_g =
+                       max_th_g, RTE_UINT64);
+static cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_g =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_wred_profile_result,
-                       maxp_inv_g, UINT16);
-cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_g =
+                       maxp_inv_g, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_g =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_wred_profile_result,
-                       wq_log2_g, UINT16);
-cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_y =
+                       wq_log2_g, RTE_UINT16);
+static cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_y =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_node_wred_profile_result,
                        color_y, "Y#y");
-cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_y =
+static cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_y =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_wred_profile_result,
-                       min_th_y, UINT64);
-cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_y =
+                       min_th_y, RTE_UINT64);
+static cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_y =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_wred_profile_result,
-                       max_th_y, UINT64);
-cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_y =
+                       max_th_y, RTE_UINT64);
+static cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_y =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_wred_profile_result,
-                       maxp_inv_y, UINT16);
-cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_y =
+                       maxp_inv_y, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_y =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_wred_profile_result,
-                       wq_log2_y, UINT16);
-cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_r =
+                       wq_log2_y, RTE_UINT16);
+static cmdline_parse_token_string_t cmd_add_port_tm_node_wred_profile_color_r =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_node_wred_profile_result,
                        color_r, "R#r");
-cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_r =
+static cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_min_th_r =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_wred_profile_result,
-                       min_th_r, UINT64);
-cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_r =
+                       min_th_r, RTE_UINT64);
+static cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_max_th_r =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_wred_profile_result,
-                       max_th_r, UINT64);
-cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_r =
+                       max_th_r, RTE_UINT64);
+static cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_maxp_inv_r =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_wred_profile_result,
-                       maxp_inv_r, UINT16);
-cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_r =
+                       maxp_inv_r, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_add_port_tm_node_wred_profile_wq_log2_r =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_node_wred_profile_result,
-                       wq_log2_r, UINT16);
+                       wq_log2_r, RTE_UINT16);
 
 
 static void cmd_add_port_tm_node_wred_profile_parsed(void *parsed_result,
@@ -1408,33 +1410,33 @@ struct cmd_del_port_tm_node_wred_profile_result {
        uint32_t wred_profile_id;
 };
 
-cmdline_parse_token_string_t cmd_del_port_tm_node_wred_profile_del =
+static cmdline_parse_token_string_t cmd_del_port_tm_node_wred_profile_del =
        TOKEN_STRING_INITIALIZER(
                struct cmd_del_port_tm_node_wred_profile_result, del, "del");
-cmdline_parse_token_string_t cmd_del_port_tm_node_wred_profile_port =
+static cmdline_parse_token_string_t cmd_del_port_tm_node_wred_profile_port =
        TOKEN_STRING_INITIALIZER(
                struct cmd_del_port_tm_node_wred_profile_result, port, "port");
-cmdline_parse_token_string_t cmd_del_port_tm_node_wred_profile_tm =
+static cmdline_parse_token_string_t cmd_del_port_tm_node_wred_profile_tm =
        TOKEN_STRING_INITIALIZER(
                struct cmd_del_port_tm_node_wred_profile_result, tm, "tm");
-cmdline_parse_token_string_t cmd_del_port_tm_node_wred_profile_node =
+static cmdline_parse_token_string_t cmd_del_port_tm_node_wred_profile_node =
        TOKEN_STRING_INITIALIZER(
                struct cmd_del_port_tm_node_wred_profile_result, node, "node");
-cmdline_parse_token_string_t cmd_del_port_tm_node_wred_profile_wred =
+static cmdline_parse_token_string_t cmd_del_port_tm_node_wred_profile_wred =
        TOKEN_STRING_INITIALIZER(
                struct cmd_del_port_tm_node_wred_profile_result, wred, "wred");
-cmdline_parse_token_string_t cmd_del_port_tm_node_wred_profile_profile =
+static cmdline_parse_token_string_t cmd_del_port_tm_node_wred_profile_profile =
        TOKEN_STRING_INITIALIZER(
                struct cmd_del_port_tm_node_wred_profile_result,
                        profile, "profile");
-cmdline_parse_token_num_t cmd_del_port_tm_node_wred_profile_port_id =
+static cmdline_parse_token_num_t cmd_del_port_tm_node_wred_profile_port_id =
        TOKEN_NUM_INITIALIZER(
                struct cmd_del_port_tm_node_wred_profile_result,
-                       port_id, UINT16);
-cmdline_parse_token_num_t cmd_del_port_tm_node_wred_profile_wred_profile_id =
+                       port_id, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_del_port_tm_node_wred_profile_wred_profile_id =
        TOKEN_NUM_INITIALIZER(
                struct cmd_del_port_tm_node_wred_profile_result,
-                       wred_profile_id, UINT32);
+                       wred_profile_id, RTE_UINT32);
 
 static void cmd_del_port_tm_node_wred_profile_parsed(void *parsed_result,
        __rte_unused struct cmdline *cl,
@@ -1487,40 +1489,40 @@ struct cmd_set_port_tm_node_shaper_profile_result {
        uint32_t shaper_profile_id;
 };
 
-cmdline_parse_token_string_t cmd_set_port_tm_node_shaper_profile_set =
+static cmdline_parse_token_string_t cmd_set_port_tm_node_shaper_profile_set =
        TOKEN_STRING_INITIALIZER(
                struct cmd_set_port_tm_node_shaper_profile_result, set, "set");
-cmdline_parse_token_string_t cmd_set_port_tm_node_shaper_profile_port =
+static cmdline_parse_token_string_t cmd_set_port_tm_node_shaper_profile_port =
        TOKEN_STRING_INITIALIZER(
                struct cmd_set_port_tm_node_shaper_profile_result,
                        port, "port");
-cmdline_parse_token_string_t cmd_set_port_tm_node_shaper_profile_tm =
+static cmdline_parse_token_string_t cmd_set_port_tm_node_shaper_profile_tm =
        TOKEN_STRING_INITIALIZER(
                struct cmd_set_port_tm_node_shaper_profile_result, tm, "tm");
-cmdline_parse_token_string_t cmd_set_port_tm_node_shaper_profile_node =
+static cmdline_parse_token_string_t cmd_set_port_tm_node_shaper_profile_node =
        TOKEN_STRING_INITIALIZER(
                struct cmd_set_port_tm_node_shaper_profile_result,
                        node, "node");
-cmdline_parse_token_string_t cmd_set_port_tm_node_shaper_profile_shaper =
+static cmdline_parse_token_string_t cmd_set_port_tm_node_shaper_profile_shaper =
        TOKEN_STRING_INITIALIZER(
                struct cmd_set_port_tm_node_shaper_profile_result,
                        shaper, "shaper");
-cmdline_parse_token_string_t cmd_set_port_tm_node_shaper_profile_profile =
+static cmdline_parse_token_string_t cmd_set_port_tm_node_shaper_profile_profile =
        TOKEN_STRING_INITIALIZER(
                struct cmd_set_port_tm_node_shaper_profile_result,
                        profile, "profile");
-cmdline_parse_token_num_t cmd_set_port_tm_node_shaper_profile_port_id =
+static cmdline_parse_token_num_t cmd_set_port_tm_node_shaper_profile_port_id =
        TOKEN_NUM_INITIALIZER(
                struct cmd_set_port_tm_node_shaper_profile_result,
-                       port_id, UINT16);
-cmdline_parse_token_num_t cmd_set_port_tm_node_shaper_profile_node_id =
+                       port_id, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_set_port_tm_node_shaper_profile_node_id =
        TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_shaper_profile_result,
-               node_id, UINT32);
-cmdline_parse_token_num_t
+               node_id, RTE_UINT32);
+static cmdline_parse_token_num_t
        cmd_set_port_tm_node_shaper_shaper_profile_profile_id =
                TOKEN_NUM_INITIALIZER(
                        struct cmd_set_port_tm_node_shaper_profile_result,
-                       shaper_profile_id, UINT32);
+                       shaper_profile_id, RTE_UINT32);
 
 static void cmd_set_port_tm_node_shaper_profile_parsed(void *parsed_result,
        __rte_unused struct cmdline *cl,
@@ -1539,7 +1541,7 @@ static void cmd_set_port_tm_node_shaper_profile_parsed(void *parsed_result,
        memset(&error, 0, sizeof(struct rte_tm_error));
        /* Port status */
        if (!port_is_started(port_id)) {
-               printf(" Port %u not started (error)\n", port_id);
+               fprintf(stderr, " Port %u not started (error)\n", port_id);
                return;
        }
 
@@ -1588,50 +1590,50 @@ struct cmd_add_port_tm_nonleaf_node_result {
        cmdline_multi_string_t multi_shared_shaper_id;
 };
 
-cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_add =
+static cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_add =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_nonleaf_node_result, add, "add");
-cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_port =
+static cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_port =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_nonleaf_node_result, port, "port");
-cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_tm =
+static cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_tm =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_nonleaf_node_result, tm, "tm");
-cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_nonleaf =
+static cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_nonleaf =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_nonleaf_node_result, nonleaf, "nonleaf");
-cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_node =
+static cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_node =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_nonleaf_node_result, node, "node");
-cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_port_id =
+static cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_port_id =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_nonleaf_node_result,
-                port_id, UINT16);
-cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_node_id =
+                port_id, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_node_id =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-                node_id, UINT32);
-cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_parent_node_id =
+                node_id, RTE_UINT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_parent_node_id =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-                parent_node_id, INT32);
-cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_priority =
+                parent_node_id, RTE_INT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_priority =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-                priority, UINT32);
-cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_weight =
+                priority, RTE_UINT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_weight =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-                weight, UINT32);
-cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_level_id =
+                weight, RTE_UINT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_level_id =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-                level_id, UINT32);
-cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_shaper_profile_id =
+                level_id, RTE_UINT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_shaper_profile_id =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-                shaper_profile_id, INT32);
-cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_n_sp_priorities =
+                shaper_profile_id, RTE_INT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_n_sp_priorities =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-                n_sp_priorities, UINT32);
-cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_stats_mask =
+                n_sp_priorities, RTE_UINT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_stats_mask =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
-                stats_mask, UINT64);
-cmdline_parse_token_string_t
+                stats_mask, RTE_UINT64);
+static cmdline_parse_token_string_t
        cmd_add_port_tm_nonleaf_node_multi_shared_shaper_id =
        TOKEN_STRING_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_result,
                 multi_shared_shaper_id, TOKEN_STRING_MULTI);
@@ -1664,14 +1666,15 @@ static void cmd_add_port_tm_nonleaf_node_parsed(void *parsed_result,
        shared_shaper_id = (uint32_t *)malloc(MAX_NUM_SHARED_SHAPERS *
                sizeof(uint32_t));
        if (shared_shaper_id == NULL) {
-               printf(" Memory not allocated for shared shapers (error)\n");
+               fprintf(stderr,
+                       " Memory not allocated for shared shapers (error)\n");
                return;
        }
 
        /* Parse multi shared shaper id string */
        ret = parse_multi_ss_id_str(s_str, &n_shared_shapers, shared_shaper_id);
        if (ret) {
-               printf(" Shared shapers params string parse error\n");
+               fprintf(stderr, " Shared shapers params string parse error\n");
                free(shared_shaper_id);
                return;
        }
@@ -1746,53 +1749,53 @@ struct cmd_add_port_tm_nonleaf_node_pmode_result {
        cmdline_multi_string_t multi_shared_shaper_id;
 };
 
-cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_pmode_add =
+static cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_pmode_add =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_nonleaf_node_pmode_result, add, "add");
-cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_pmode_port =
+static cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_pmode_port =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_nonleaf_node_pmode_result, port, "port");
-cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_pmode_tm =
+static cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_pmode_tm =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_nonleaf_node_pmode_result, tm, "tm");
-cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_pmode_nonleaf =
+static cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_pmode_nonleaf =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_nonleaf_node_pmode_result, nonleaf, "nonleaf");
-cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_pmode_node =
+static cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_pmode_node =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_nonleaf_node_pmode_result, node, "node");
-cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_pmode_pktmode =
+static cmdline_parse_token_string_t cmd_add_port_tm_nonleaf_node_pmode_pktmode =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_nonleaf_node_pmode_result, node, "pktmode");
-cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_port_id =
+static cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_port_id =
        TOKEN_NUM_INITIALIZER(
                struct cmd_add_port_tm_nonleaf_node_pmode_result,
-                port_id, UINT16);
-cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_node_id =
+                port_id, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_node_id =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_pmode_result,
-                node_id, UINT32);
-cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_parent_node_id =
+                node_id, RTE_UINT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_parent_node_id =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_pmode_result,
-                parent_node_id, INT32);
-cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_priority =
+                parent_node_id, RTE_INT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_priority =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_pmode_result,
-                priority, UINT32);
-cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_weight =
+                priority, RTE_UINT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_weight =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_pmode_result,
-                weight, UINT32);
-cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_level_id =
+                weight, RTE_UINT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_level_id =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_pmode_result,
-                level_id, UINT32);
-cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_shaper_profile_id =
+                level_id, RTE_UINT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_shaper_profile_id =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_pmode_result,
-                shaper_profile_id, INT32);
-cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_n_sp_priorities =
+                shaper_profile_id, RTE_INT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_n_sp_priorities =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_pmode_result,
-                n_sp_priorities, UINT32);
-cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_stats_mask =
+                n_sp_priorities, RTE_UINT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_nonleaf_node_pmode_stats_mask =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_nonleaf_node_pmode_result,
-                stats_mask, UINT64);
-cmdline_parse_token_string_t
+                stats_mask, RTE_UINT64);
+static cmdline_parse_token_string_t
        cmd_add_port_tm_nonleaf_node_pmode_multi_shrd_shpr_id =
        TOKEN_STRING_INITIALIZER(
                        struct cmd_add_port_tm_nonleaf_node_pmode_result,
@@ -1827,14 +1830,15 @@ static void cmd_add_port_tm_nonleaf_node_pmode_parsed(void *parsed_result,
        shared_shaper_id = (uint32_t *)malloc(MAX_NUM_SHARED_SHAPERS *
                sizeof(uint32_t));
        if (shared_shaper_id == NULL) {
-               printf(" Memory not allocated for shared shapers (error)\n");
+               fprintf(stderr,
+                       " Memory not allocated for shared shapers (error)\n");
                return;
        }
 
        /* Parse multi shared shaper id string */
        ret = parse_multi_ss_id_str(s_str, &n_shared_shapers, shared_shaper_id);
        if (ret) {
-               printf(" Shared shapers params string parse error\n");
+               fprintf(stderr, " Shared shapers params string parse error\n");
                free(shared_shaper_id);
                return;
        }
@@ -1913,52 +1917,52 @@ struct cmd_add_port_tm_leaf_node_result {
        cmdline_multi_string_t multi_shared_shaper_id;
 };
 
-cmdline_parse_token_string_t cmd_add_port_tm_leaf_node_add =
+static cmdline_parse_token_string_t cmd_add_port_tm_leaf_node_add =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_leaf_node_result, add, "add");
-cmdline_parse_token_string_t cmd_add_port_tm_leaf_node_port =
+static cmdline_parse_token_string_t cmd_add_port_tm_leaf_node_port =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_leaf_node_result, port, "port");
-cmdline_parse_token_string_t cmd_add_port_tm_leaf_node_tm =
+static cmdline_parse_token_string_t cmd_add_port_tm_leaf_node_tm =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_leaf_node_result, tm, "tm");
-cmdline_parse_token_string_t cmd_add_port_tm_leaf_node_nonleaf =
+static cmdline_parse_token_string_t cmd_add_port_tm_leaf_node_nonleaf =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_leaf_node_result, leaf, "leaf");
-cmdline_parse_token_string_t cmd_add_port_tm_leaf_node_node =
+static cmdline_parse_token_string_t cmd_add_port_tm_leaf_node_node =
        TOKEN_STRING_INITIALIZER(
                struct cmd_add_port_tm_leaf_node_result, node, "node");
-cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_port_id =
+static cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-                port_id, UINT16);
-cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_node_id =
+                port_id, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_node_id =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-                node_id, UINT32);
-cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_parent_node_id =
+                node_id, RTE_UINT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_parent_node_id =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-                parent_node_id, INT32);
-cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_priority =
+                parent_node_id, RTE_INT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_priority =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-                priority, UINT32);
-cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_weight =
+                priority, RTE_UINT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_weight =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-                weight, UINT32);
-cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_level_id =
+                weight, RTE_UINT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_level_id =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-                level_id, UINT32);
-cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_shaper_profile_id =
+                level_id, RTE_UINT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_shaper_profile_id =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-                shaper_profile_id, INT32);
-cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_cman_mode =
+                shaper_profile_id, RTE_INT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_cman_mode =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-                cman_mode, UINT32);
-cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_wred_profile_id =
+                cman_mode, RTE_UINT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_wred_profile_id =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-                wred_profile_id, UINT32);
-cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_stats_mask =
+                wred_profile_id, RTE_UINT32);
+static cmdline_parse_token_num_t cmd_add_port_tm_leaf_node_stats_mask =
        TOKEN_NUM_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
-                stats_mask, UINT64);
-cmdline_parse_token_string_t
+                stats_mask, RTE_UINT64);
+static cmdline_parse_token_string_t
        cmd_add_port_tm_leaf_node_multi_shared_shaper_id =
        TOKEN_STRING_INITIALIZER(struct cmd_add_port_tm_leaf_node_result,
                 multi_shared_shaper_id, TOKEN_STRING_MULTI);
@@ -1991,14 +1995,15 @@ static void cmd_add_port_tm_leaf_node_parsed(void *parsed_result,
        shared_shaper_id = (uint32_t *)malloc(MAX_NUM_SHARED_SHAPERS *
                sizeof(uint32_t));
        if (shared_shaper_id == NULL) {
-               printf(" Memory not allocated for shared shapers (error)\n");
+               fprintf(stderr,
+                       " Memory not allocated for shared shapers (error)\n");
                return;
        }
 
        /* Parse multi shared shaper id string */
        ret = parse_multi_ss_id_str(s_str, &n_shared_shapers, shared_shaper_id);
        if (ret) {
-               printf(" Shared shapers params string parse error\n");
+               fprintf(stderr, " Shared shapers params string parse error\n");
                free(shared_shaper_id);
                return;
        }
@@ -2066,24 +2071,24 @@ struct cmd_del_port_tm_node_result {
        uint32_t node_id;
 };
 
-cmdline_parse_token_string_t cmd_del_port_tm_node_del =
+static cmdline_parse_token_string_t cmd_del_port_tm_node_del =
        TOKEN_STRING_INITIALIZER(
                struct cmd_del_port_tm_node_result, del, "del");
-cmdline_parse_token_string_t cmd_del_port_tm_node_port =
+static cmdline_parse_token_string_t cmd_del_port_tm_node_port =
        TOKEN_STRING_INITIALIZER(
                struct cmd_del_port_tm_node_result, port, "port");
-cmdline_parse_token_string_t cmd_del_port_tm_node_tm =
+static cmdline_parse_token_string_t cmd_del_port_tm_node_tm =
        TOKEN_STRING_INITIALIZER(
                struct cmd_del_port_tm_node_result, tm, "tm");
-cmdline_parse_token_string_t cmd_del_port_tm_node_node =
+static cmdline_parse_token_string_t cmd_del_port_tm_node_node =
        TOKEN_STRING_INITIALIZER(
                struct cmd_del_port_tm_node_result, node, "node");
-cmdline_parse_token_num_t cmd_del_port_tm_node_port_id =
+static cmdline_parse_token_num_t cmd_del_port_tm_node_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_del_port_tm_node_result,
-                port_id, UINT16);
-cmdline_parse_token_num_t cmd_del_port_tm_node_node_id =
+                port_id, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_del_port_tm_node_node_id =
        TOKEN_NUM_INITIALIZER(struct cmd_del_port_tm_node_result,
-               node_id, UINT32);
+               node_id, RTE_UINT32);
 
 static void cmd_del_port_tm_node_parsed(void *parsed_result,
        __rte_unused struct cmdline *cl,
@@ -2101,7 +2106,7 @@ static void cmd_del_port_tm_node_parsed(void *parsed_result,
        memset(&error, 0, sizeof(struct rte_tm_error));
        /* Port status */
        if (port_is_started(port_id)) {
-               printf(" Port %u not stopped (error)\n", port_id);
+               fprintf(stderr, " Port %u not stopped (error)\n", port_id);
                return;
        }
 
@@ -2141,36 +2146,38 @@ struct cmd_set_port_tm_node_parent_result {
        uint32_t weight;
 };
 
-cmdline_parse_token_string_t cmd_set_port_tm_node_parent_set =
+static cmdline_parse_token_string_t cmd_set_port_tm_node_parent_set =
        TOKEN_STRING_INITIALIZER(
                struct cmd_set_port_tm_node_parent_result, set, "set");
-cmdline_parse_token_string_t cmd_set_port_tm_node_parent_port =
+static cmdline_parse_token_string_t cmd_set_port_tm_node_parent_port =
        TOKEN_STRING_INITIALIZER(
                struct cmd_set_port_tm_node_parent_result, port, "port");
-cmdline_parse_token_string_t cmd_set_port_tm_node_parent_tm =
+static cmdline_parse_token_string_t cmd_set_port_tm_node_parent_tm =
        TOKEN_STRING_INITIALIZER(
                struct cmd_set_port_tm_node_parent_result, tm, "tm");
-cmdline_parse_token_string_t cmd_set_port_tm_node_parent_node =
+static cmdline_parse_token_string_t cmd_set_port_tm_node_parent_node =
        TOKEN_STRING_INITIALIZER(
                struct cmd_set_port_tm_node_parent_result, node, "node");
-cmdline_parse_token_string_t cmd_set_port_tm_node_parent_parent =
+static cmdline_parse_token_string_t cmd_set_port_tm_node_parent_parent =
        TOKEN_STRING_INITIALIZER(
                struct cmd_set_port_tm_node_parent_result, parent, "parent");
-cmdline_parse_token_num_t cmd_set_port_tm_node_parent_port_id =
+static cmdline_parse_token_num_t cmd_set_port_tm_node_parent_port_id =
        TOKEN_NUM_INITIALIZER(
-               struct cmd_set_port_tm_node_parent_result, port_id, UINT16);
-cmdline_parse_token_num_t cmd_set_port_tm_node_parent_node_id =
+               struct cmd_set_port_tm_node_parent_result, port_id,
+               RTE_UINT16);
+static cmdline_parse_token_num_t cmd_set_port_tm_node_parent_node_id =
        TOKEN_NUM_INITIALIZER(
-               struct cmd_set_port_tm_node_parent_result, node_id, UINT32);
-cmdline_parse_token_num_t cmd_set_port_tm_node_parent_parent_id =
+               struct cmd_set_port_tm_node_parent_result, node_id,
+               RTE_UINT32);
+static cmdline_parse_token_num_t cmd_set_port_tm_node_parent_parent_id =
        TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_parent_result,
-               parent_id, UINT32);
-cmdline_parse_token_num_t cmd_set_port_tm_node_parent_priority =
+               parent_id, RTE_UINT32);
+static cmdline_parse_token_num_t cmd_set_port_tm_node_parent_priority =
        TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_parent_result,
-               priority, UINT32);
-cmdline_parse_token_num_t cmd_set_port_tm_node_parent_weight =
+               priority, RTE_UINT32);
+static cmdline_parse_token_num_t cmd_set_port_tm_node_parent_weight =
        TOKEN_NUM_INITIALIZER(struct cmd_set_port_tm_node_parent_result,
-               weight, UINT32);
+               weight, RTE_UINT32);
 
 static void cmd_set_port_tm_node_parent_parsed(void *parsed_result,
        __rte_unused struct cmdline *cl,
@@ -2191,7 +2198,7 @@ static void cmd_set_port_tm_node_parent_parsed(void *parsed_result,
        memset(&error, 0, sizeof(struct rte_tm_error));
        /* Port status */
        if (!port_is_started(port_id)) {
-               printf(" Port %u not started (error)\n", port_id);
+               fprintf(stderr, " Port %u not started (error)\n", port_id);
                return;
        }
 
@@ -2232,24 +2239,26 @@ struct cmd_suspend_port_tm_node_result {
        uint32_t node_id;
 };
 
-cmdline_parse_token_string_t cmd_suspend_port_tm_node_suspend =
+static cmdline_parse_token_string_t cmd_suspend_port_tm_node_suspend =
        TOKEN_STRING_INITIALIZER(
                struct cmd_suspend_port_tm_node_result, suspend, "suspend");
-cmdline_parse_token_string_t cmd_suspend_port_tm_node_port =
+static cmdline_parse_token_string_t cmd_suspend_port_tm_node_port =
        TOKEN_STRING_INITIALIZER(
                struct cmd_suspend_port_tm_node_result, port, "port");
-cmdline_parse_token_string_t cmd_suspend_port_tm_node_tm =
+static cmdline_parse_token_string_t cmd_suspend_port_tm_node_tm =
        TOKEN_STRING_INITIALIZER(
                struct cmd_suspend_port_tm_node_result, tm, "tm");
-cmdline_parse_token_string_t cmd_suspend_port_tm_node_node =
+static cmdline_parse_token_string_t cmd_suspend_port_tm_node_node =
        TOKEN_STRING_INITIALIZER(
                struct cmd_suspend_port_tm_node_result, node, "node");
-cmdline_parse_token_num_t cmd_suspend_port_tm_node_port_id =
+static cmdline_parse_token_num_t cmd_suspend_port_tm_node_port_id =
        TOKEN_NUM_INITIALIZER(
-               struct cmd_suspend_port_tm_node_result, port_id, UINT16);
-cmdline_parse_token_num_t cmd_suspend_port_tm_node_node_id =
+               struct cmd_suspend_port_tm_node_result, port_id,
+               RTE_UINT16);
+static cmdline_parse_token_num_t cmd_suspend_port_tm_node_node_id =
        TOKEN_NUM_INITIALIZER(
-               struct cmd_suspend_port_tm_node_result, node_id, UINT32);
+               struct cmd_suspend_port_tm_node_result, node_id,
+               RTE_UINT32);
 
 static void cmd_suspend_port_tm_node_parsed(void *parsed_result,
        __rte_unused struct cmdline *cl,
@@ -2297,24 +2306,24 @@ struct cmd_resume_port_tm_node_result {
        uint32_t node_id;
 };
 
-cmdline_parse_token_string_t cmd_resume_port_tm_node_resume =
+static cmdline_parse_token_string_t cmd_resume_port_tm_node_resume =
        TOKEN_STRING_INITIALIZER(
                struct cmd_resume_port_tm_node_result, resume, "resume");
-cmdline_parse_token_string_t cmd_resume_port_tm_node_port =
+static cmdline_parse_token_string_t cmd_resume_port_tm_node_port =
        TOKEN_STRING_INITIALIZER(
                struct cmd_resume_port_tm_node_result, port, "port");
-cmdline_parse_token_string_t cmd_resume_port_tm_node_tm =
+static cmdline_parse_token_string_t cmd_resume_port_tm_node_tm =
        TOKEN_STRING_INITIALIZER(
                struct cmd_resume_port_tm_node_result, tm, "tm");
-cmdline_parse_token_string_t cmd_resume_port_tm_node_node =
+static cmdline_parse_token_string_t cmd_resume_port_tm_node_node =
        TOKEN_STRING_INITIALIZER(
                struct cmd_resume_port_tm_node_result, node, "node");
-cmdline_parse_token_num_t cmd_resume_port_tm_node_port_id =
+static cmdline_parse_token_num_t cmd_resume_port_tm_node_port_id =
        TOKEN_NUM_INITIALIZER(
-               struct cmd_resume_port_tm_node_result, port_id, UINT16);
-cmdline_parse_token_num_t cmd_resume_port_tm_node_node_id =
+               struct cmd_resume_port_tm_node_result, port_id, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_resume_port_tm_node_node_id =
        TOKEN_NUM_INITIALIZER(
-               struct cmd_resume_port_tm_node_result, node_id, UINT32);
+               struct cmd_resume_port_tm_node_result, node_id, RTE_UINT32);
 
 static void cmd_resume_port_tm_node_parsed(void *parsed_result,
        __rte_unused struct cmdline *cl,
@@ -2362,24 +2371,24 @@ struct cmd_port_tm_hierarchy_commit_result {
        cmdline_fixed_string_t clean_on_fail;
 };
 
-cmdline_parse_token_string_t cmd_port_tm_hierarchy_commit_port =
+static cmdline_parse_token_string_t cmd_port_tm_hierarchy_commit_port =
        TOKEN_STRING_INITIALIZER(
                struct cmd_port_tm_hierarchy_commit_result, port, "port");
-cmdline_parse_token_string_t cmd_port_tm_hierarchy_commit_tm =
+static cmdline_parse_token_string_t cmd_port_tm_hierarchy_commit_tm =
        TOKEN_STRING_INITIALIZER(
                struct cmd_port_tm_hierarchy_commit_result, tm, "tm");
-cmdline_parse_token_string_t cmd_port_tm_hierarchy_commit_hierarchy =
+static cmdline_parse_token_string_t cmd_port_tm_hierarchy_commit_hierarchy =
        TOKEN_STRING_INITIALIZER(
                struct cmd_port_tm_hierarchy_commit_result,
                        hierarchy, "hierarchy");
-cmdline_parse_token_string_t cmd_port_tm_hierarchy_commit_commit =
+static cmdline_parse_token_string_t cmd_port_tm_hierarchy_commit_commit =
        TOKEN_STRING_INITIALIZER(
                struct cmd_port_tm_hierarchy_commit_result, commit, "commit");
-cmdline_parse_token_num_t cmd_port_tm_hierarchy_commit_port_id =
+static cmdline_parse_token_num_t cmd_port_tm_hierarchy_commit_port_id =
        TOKEN_NUM_INITIALIZER(
                struct cmd_port_tm_hierarchy_commit_result,
-                       port_id, UINT16);
-cmdline_parse_token_string_t cmd_port_tm_hierarchy_commit_clean_on_fail =
+                       port_id, RTE_UINT16);
+static cmdline_parse_token_string_t cmd_port_tm_hierarchy_commit_clean_on_fail =
        TOKEN_STRING_INITIALIZER(struct cmd_port_tm_hierarchy_commit_result,
                 clean_on_fail, "yes#no");
 
@@ -2437,38 +2446,38 @@ struct cmd_port_tm_mark_ip_ecn_result {
        uint16_t red;
 };
 
-cmdline_parse_token_string_t cmd_port_tm_mark_ip_ecn_set =
+static cmdline_parse_token_string_t cmd_port_tm_mark_ip_ecn_set =
        TOKEN_STRING_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
                                 set, "set");
 
-cmdline_parse_token_string_t cmd_port_tm_mark_ip_ecn_port =
+static cmdline_parse_token_string_t cmd_port_tm_mark_ip_ecn_port =
        TOKEN_STRING_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
                                 port, "port");
 
-cmdline_parse_token_string_t cmd_port_tm_mark_ip_ecn_tm =
+static cmdline_parse_token_string_t cmd_port_tm_mark_ip_ecn_tm =
        TOKEN_STRING_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result, tm,
                                 "tm");
 
-cmdline_parse_token_string_t cmd_port_tm_mark_ip_ecn_mark =
+static cmdline_parse_token_string_t cmd_port_tm_mark_ip_ecn_mark =
        TOKEN_STRING_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
                                 mark, "mark");
 
-cmdline_parse_token_string_t cmd_port_tm_mark_ip_ecn_ip_ecn =
+static cmdline_parse_token_string_t cmd_port_tm_mark_ip_ecn_ip_ecn =
        TOKEN_STRING_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
                                 ip_ecn, "ip_ecn");
-cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_port_id =
+static cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
-                             port_id, UINT16);
+                             port_id, RTE_UINT16);
 
-cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_green =
+static cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_green =
        TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
-                             green, UINT16);
-cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_yellow =
+                             green, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_yellow =
        TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
-                             yellow, UINT16);
-cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_red =
+                             yellow, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_port_tm_mark_ip_ecn_red =
        TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_ecn_result,
-                               red, UINT16);
+                               red, RTE_UINT16);
 
 static void cmd_port_tm_mark_ip_ecn_parsed(void *parsed_result,
        __rte_unused struct cmdline *cl,
@@ -2524,38 +2533,38 @@ struct cmd_port_tm_mark_ip_dscp_result {
        uint16_t red;
 };
 
-cmdline_parse_token_string_t cmd_port_tm_mark_ip_dscp_set =
+static cmdline_parse_token_string_t cmd_port_tm_mark_ip_dscp_set =
        TOKEN_STRING_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
                                 set, "set");
 
-cmdline_parse_token_string_t cmd_port_tm_mark_ip_dscp_port =
+static cmdline_parse_token_string_t cmd_port_tm_mark_ip_dscp_port =
        TOKEN_STRING_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
                                 port, "port");
 
-cmdline_parse_token_string_t cmd_port_tm_mark_ip_dscp_tm =
+static cmdline_parse_token_string_t cmd_port_tm_mark_ip_dscp_tm =
        TOKEN_STRING_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result, tm,
                                 "tm");
 
-cmdline_parse_token_string_t cmd_port_tm_mark_ip_dscp_mark =
+static cmdline_parse_token_string_t cmd_port_tm_mark_ip_dscp_mark =
        TOKEN_STRING_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
                                 mark, "mark");
 
-cmdline_parse_token_string_t cmd_port_tm_mark_ip_dscp_ip_dscp =
+static cmdline_parse_token_string_t cmd_port_tm_mark_ip_dscp_ip_dscp =
        TOKEN_STRING_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
                                 ip_dscp, "ip_dscp");
-cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_port_id =
+static cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
-                             port_id, UINT16);
+                             port_id, RTE_UINT16);
 
-cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_green =
+static cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_green =
        TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
-                               green, UINT16);
-cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_yellow =
+                               green, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_yellow =
        TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
-                               yellow, UINT16);
-cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_red =
+                               yellow, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_port_tm_mark_ip_dscp_red =
        TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_ip_dscp_result,
-                               red, UINT16);
+                               red, RTE_UINT16);
 
 static void cmd_port_tm_mark_ip_dscp_parsed(void *parsed_result,
        __rte_unused struct cmdline *cl,
@@ -2611,38 +2620,38 @@ struct cmd_port_tm_mark_vlan_dei_result {
        uint16_t red;
 };
 
-cmdline_parse_token_string_t cmd_port_tm_mark_vlan_dei_set =
+static cmdline_parse_token_string_t cmd_port_tm_mark_vlan_dei_set =
        TOKEN_STRING_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
                                 set, "set");
 
-cmdline_parse_token_string_t cmd_port_tm_mark_vlan_dei_port =
+static cmdline_parse_token_string_t cmd_port_tm_mark_vlan_dei_port =
        TOKEN_STRING_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
                                 port, "port");
 
-cmdline_parse_token_string_t cmd_port_tm_mark_vlan_dei_tm =
+static cmdline_parse_token_string_t cmd_port_tm_mark_vlan_dei_tm =
        TOKEN_STRING_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result, tm,
                                 "tm");
 
-cmdline_parse_token_string_t cmd_port_tm_mark_vlan_dei_mark =
+static cmdline_parse_token_string_t cmd_port_tm_mark_vlan_dei_mark =
        TOKEN_STRING_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
                                 mark, "mark");
 
-cmdline_parse_token_string_t cmd_port_tm_mark_vlan_dei_vlan_dei =
+static cmdline_parse_token_string_t cmd_port_tm_mark_vlan_dei_vlan_dei =
        TOKEN_STRING_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
                                 vlan_dei, "vlan_dei");
-cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_port_id =
+static cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_port_id =
        TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
-                             port_id, UINT16);
+                             port_id, RTE_UINT16);
 
-cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_green =
+static cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_green =
        TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
-                               green, UINT16);
-cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_yellow =
+                               green, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_yellow =
        TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
-                               yellow, UINT16);
-cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_red =
+                               yellow, RTE_UINT16);
+static cmdline_parse_token_num_t cmd_port_tm_mark_vlan_dei_red =
        TOKEN_NUM_INITIALIZER(struct cmd_port_tm_mark_vlan_dei_result,
-                               red, UINT16);
+                               red, RTE_UINT16);
 
 static void cmd_port_tm_mark_vlan_dei_parsed(void *parsed_result,
        __rte_unused struct cmdline *cl,