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

Kevin Traynor ktraynor at redhat.com
Tue Dec 10 15:59:15 CET 2019


Hi,

FYI, your patch has been queued to LTS release 18.11.6

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/16/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/9945223e20cecac026735c3ef48db9cd19368b54

Thanks.

Kevin.

---
>From 9945223e20cecac026735c3ef48db9cd19368b54 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 2d9e7689a..1a55479a2 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
@@ -159,5 +159,5 @@ 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);
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-10 14:49:41.847141346 +0000
+++ 0041-examples-vm_power-fix-type-of-cmdline-token-in-cli.patch	2019-12-10 14:49:39.071457413 +0000
@@ -1 +1 @@
-From 99dc01446e62361d8d0046c2e007bba86cb8ec30 Mon Sep 17 00:00:00 2001
+From 9945223e20cecac026735c3ef48db9cd19368b54 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 99dc01446e62361d8d0046c2e007bba86cb8ec30 ]
+
@@ -18 +19,0 @@
-Cc: stable at dpdk.org
@@ -27 +28 @@
-index fe09b0778..610d9aeac 100644
+index 2d9e7689a..1a55479a2 100644
@@ -30 +31 @@
-@@ -172,5 +172,5 @@ cmdline_parse_token_string_t cmd_set_cpu_freq =
+@@ -159,5 +159,5 @@ cmdline_parse_token_string_t cmd_set_cpu_freq =



More information about the stable mailing list