net/ixgbe: fix filter parser for L2 tunnel

[dpdk.git] / examples / vm_power_manager / vm_power_cli.c

diff --git a/examples/vm_power_manager/vm_power_cli.c b/examples/vm_power_manager/vm_power_cli.c
index e7f4469..6f234fb 100644 (file)
--- a/examples/vm_power_manager/vm_power_cli.c
+++ b/examples/vm_power_manager/vm_power_cli.c
@@ -45,7 +45,6 @@
 #include <cmdline_parse_num.h>
 #include <cmdline_socket.h>
 #include <cmdline.h>
-#include <rte_config.h>
 
 #include "vm_power_cli.h"
 #include "channel_manager.h"
@@ -323,7 +322,7 @@ cmd_channels_op_parsed(void *parsed_result, struct cmdline *cl,
                        break;
                errno = 0;
                channel_num = (unsigned)strtol(token, &tail_ptr, 10);
-               if ((errno != 0) || (*tail_ptr != '\0') || tail_ptr == NULL)
+               if ((errno != 0) || tail_ptr == NULL || (*tail_ptr != '\0'))
                        break;
 
                if (channel_num == CHANNEL_CMDS_MAX_VM_CHANNELS) {
@@ -408,7 +407,7 @@ cmd_channels_status_op_parsed(void *parsed_result, struct cmdline *cl,
                        break;
                errno = 0;
                channel_num = (unsigned)strtol(token, &tail_ptr, 10);
-               if ((errno != 0) || (*tail_ptr != '\0') || tail_ptr == NULL)
+               if ((errno != 0) || tail_ptr == NULL || (*tail_ptr != '\0'))
                        break;
 
                if (channel_num == CHANNEL_CMDS_MAX_VM_CHANNELS) {
@@ -521,6 +520,10 @@ cmd_set_cpu_freq_mask_parsed(void *parsed_result, struct cmdline *cl,
                ret = power_manager_scale_mask_min(res->core_mask);
        else if (!strcmp(res->cmd , "max"))
                ret = power_manager_scale_mask_max(res->core_mask);
+       else if (!strcmp(res->cmd, "enable_turbo"))
+               ret = power_manager_enable_turbo_mask(res->core_mask);
+       else if (!strcmp(res->cmd, "disable_turbo"))
+               ret = power_manager_disable_turbo_mask(res->core_mask);
        if (ret < 0) {
                cmdline_printf(cl, "Error scaling core_mask(0x%"PRIx64") '%s' , not "
                                "all cores specified have been scaled\n",
@@ -536,14 +539,13 @@ cmdline_parse_token_num_t cmd_set_cpu_freq_mask_core_mask =
                        core_mask, UINT64);
 cmdline_parse_token_string_t cmd_set_cpu_freq_mask_result =
        TOKEN_STRING_INITIALIZER(struct cmd_set_cpu_freq_mask_result,
-                       cmd, "up#down#min#max");
+                       cmd, "up#down#min#max#enable_turbo#disable_turbo");
 
 cmdline_parse_inst_t cmd_set_cpu_freq_mask_set = {
        .f = cmd_set_cpu_freq_mask_parsed,
        .data = NULL,
-       .help_str = "set_cpu_freq <core_mask> <up|down|min|max>, Set the current "
-                       "frequency for the cores specified in <core_mask> by scaling "
-                       "each up/down/min/max.",
+       .help_str = "set_cpu_freq <core_mask> <up|down|min|max|enable_turbo|disable_turbo>, adjust the current "
+                       "frequency for the cores specified in <core_mask>",
        .tokens = {
                (void *)&cmd_set_cpu_freq_mask,
                (void *)&cmd_set_cpu_freq_mask_core_mask,
@@ -615,6 +617,10 @@ cmd_set_cpu_freq_parsed(void *parsed_result, struct cmdline *cl,
                ret = power_manager_scale_core_min(res->core_num);
        else if (!strcmp(res->cmd , "max"))
                ret = power_manager_scale_core_max(res->core_num);
+       else if (!strcmp(res->cmd, "enable_turbo"))
+               ret = power_manager_enable_turbo_core(res->core_num);
+       else if (!strcmp(res->cmd, "disable_turbo"))
+               ret = power_manager_disable_turbo_core(res->core_num);
        if (ret < 0) {
                cmdline_printf(cl, "Error scaling core(%u) '%s'\n", res->core_num,
                                res->cmd);
@@ -624,18 +630,18 @@ cmd_set_cpu_freq_parsed(void *parsed_result, struct cmdline *cl,
 cmdline_parse_token_string_t cmd_set_cpu_freq =
        TOKEN_STRING_INITIALIZER(struct cmd_set_cpu_freq_result,
                        set_cpu_freq, "set_cpu_freq");
-cmdline_parse_token_string_t cmd_set_cpu_freq_core_num =
+cmdline_parse_token_num_t cmd_set_cpu_freq_core_num =
        TOKEN_NUM_INITIALIZER(struct cmd_set_cpu_freq_result,
                        core_num, UINT8);
 cmdline_parse_token_string_t cmd_set_cpu_freq_cmd_cmd =
        TOKEN_STRING_INITIALIZER(struct cmd_set_cpu_freq_result,
-                       cmd, "up#down#min#max");
+                       cmd, "up#down#min#max#enable_turbo#disable_turbo");
 
 cmdline_parse_inst_t cmd_set_cpu_freq_set = {
        .f = cmd_set_cpu_freq_parsed,
        .data = NULL,
-       .help_str = "set_cpu_freq <core_num> <up|down|min|max>, Set the current "
-                       "frequency for the specified core by scaling up/down/min/max",
+       .help_str = "set_cpu_freq <core_num> <up|down|min|max|enable_turbo|disable_turbo>, adjust the current "
+                       "frequency for the specified core",
        .tokens = {
                (void *)&cmd_set_cpu_freq,
                (void *)&cmd_set_cpu_freq_core_num,