[dpdk-stable] patch 'examples/vm_power: fix type of cmdline token in cli' has been queued to LTS release 17.11.10

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to LTS release 17.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/21/19. 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 289e2019fe9d50d133b1e296ee8c05f305281c44 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Tue, 22 Oct 2019 16:43:09 +0100
Subject: [PATCH] examples/vm_power: fix type of cmdline token in cli

[ upstream commit 99dc01446e62361d8d0046c2e007bba86cb8ec30 ]

Building the example with clang gives the error:

  error: expression which evaluates to zero treated as a null pointer
  constant of type 'const char *' [-Werror,-Wnon-literal-null-conversion]
                        lcore_id, UINT8);
                                  ^~~~~

This error is due to the wrong data type being given for the
cmd_set_cpu_freq_core_num value - it was specified as string rather than
numeric type.

Fixes: f5e5c3347ae3 ("examples/vm_power: cli in guest")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: David Hunt <david.hunt at intel.com>
---
 examples/vm_power_manager/guest_cli/vm_power_cli_guest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
index 63f711e08f..61a3dd6630 100644
--- a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
+++ b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
@@ -121,7 +121,7 @@ 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,
 			lcore_id, UINT8);
 cmdline_parse_token_string_t cmd_set_cpu_freq_cmd_cmd =
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-19 14:32:30.047694257 +0000
+++ 0093-examples-vm_power-fix-type-of-cmdline-token-in-cli.patch	2019-12-19 14:32:26.221300126 +0000
@@ -1,8 +1,10 @@
-From 99dc01446e62361d8d0046c2e007bba86cb8ec30 Mon Sep 17 00:00:00 2001
+From 289e2019fe9d50d133b1e296ee8c05f305281c44 Mon Sep 17 00:00:00 2001
 From: Bruce Richardson <bruce.richardson at intel.com>
 Date: Tue, 22 Oct 2019 16:43:09 +0100
 Subject: [PATCH] examples/vm_power: fix type of cmdline token in cli
 
+[ upstream commit 99dc01446e62361d8d0046c2e007bba86cb8ec30 ]
+
 Building the example with clang gives the error:
 
   error: expression which evaluates to zero treated as a null pointer
@@ -15,7 +17,6 @@
 numeric type.
 
 Fixes: f5e5c3347ae3 ("examples/vm_power: cli in guest")
-Cc: stable at dpdk.org
 
 Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
 Acked-by: David Hunt <david.hunt at intel.com>
@@ -24,10 +25,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
-index fe09b0778a..610d9aeac5 100644
+index 63f711e08f..61a3dd6630 100644
 --- a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
 +++ b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
-@@ -171,7 +171,7 @@ cmd_set_cpu_freq_parsed(void *parsed_result, struct cmdline *cl,
+@@ -121,7 +121,7 @@ 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");