[dpdk-stable] patch 'telemetry: fix build' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/28/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/7d4a8db6489eaa3a5bdff728fa6254b7729ded0f

Thanks.

Kevin Traynor

---
>From 7d4a8db6489eaa3a5bdff728fa6254b7729ded0f Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit at intel.com>
Date: Thu, 22 Aug 2019 16:07:50 +0100
Subject: [PATCH] telemetry: fix build

[ upstream commit 500e70b90c05c267d53963c757c3b1f66908b2fa ]

Build error:
../lib/librte_telemetry/rte_telemetry.c:558:28:
error: comparison of unsigned expression < 0 is always false
[-Werror,-Wtautological-compare]

Build error not observed in default make build because telemetry library
disabled by default but easier to reproduce via meson.

Fixing by converting unsigned variables to signed.

Fixes: 0fe3a37924d4 ("telemetry: format json response when sending stats")
Fixes: 4080e46c8078 ("telemetry: support global metrics")

Signed-off-by: Ferruh Yigit <ferruh.yigit at intel.com>
Acked-by: Kevin Laatz <kevin.laatz at intel.com>
---
 lib/librte_telemetry/rte_telemetry.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/librte_telemetry/rte_telemetry.c b/lib/librte_telemetry/rte_telemetry.c
index 7fb247eaa..eceb7e116 100644
--- a/lib/librte_telemetry/rte_telemetry.c
+++ b/lib/librte_telemetry/rte_telemetry.c
@@ -319,5 +319,5 @@ static int32_t
 rte_telemetry_json_format_port(struct telemetry_impl *telemetry,
 	uint32_t port_id, json_t *ports, uint32_t *metric_ids,
-	uint32_t num_metric_ids)
+	int num_metric_ids)
 {
 	struct rte_metric_value *metrics = 0;
@@ -325,5 +325,5 @@ rte_telemetry_json_format_port(struct telemetry_impl *telemetry,
 	int num_metrics, ret, err_ret;
 	json_t *port, *stats;
-	uint32_t i;
+	int i;
 
 	num_metrics = rte_metrics_get_names(NULL, 0);
@@ -450,10 +450,10 @@ einval_fail:
 static int32_t
 rte_telemetry_encode_json_format(struct telemetry_impl *telemetry,
-	uint32_t *port_ids, uint32_t num_port_ids, uint32_t *metric_ids,
-	uint32_t num_metric_ids, char **json_buffer)
+	uint32_t *port_ids, int num_port_ids, uint32_t *metric_ids,
+	int num_metric_ids, char **json_buffer)
 {
 	int ret;
 	json_t *root, *ports;
-	uint32_t i;
+	int i;
 
 	if (num_port_ids <= 0 || num_metric_ids <= 0) {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:23.355327300 +0100
+++ 0045-telemetry-fix-build.patch	2019-08-22 19:38:20.477025926 +0100
@@ -1 +1 @@
-From 500e70b90c05c267d53963c757c3b1f66908b2fa Mon Sep 17 00:00:00 2001
+From 7d4a8db6489eaa3a5bdff728fa6254b7729ded0f Mon Sep 17 00:00:00 2001
@@ -3 +3 @@
-Date: Thu, 27 Jun 2019 20:51:44 +0100
+Date: Thu, 22 Aug 2019 16:07:50 +0100
@@ -5,0 +6,2 @@
+[ upstream commit 500e70b90c05c267d53963c757c3b1f66908b2fa ]
+
@@ -8,2 +10,2 @@
-  error: comparison of unsigned expression < 0 is always false
-  [-Werror,-Wtautological-compare]
+error: comparison of unsigned expression < 0 is always false
+[-Werror,-Wtautological-compare]
@@ -18 +19,0 @@
-Cc: stable at dpdk.org
@@ -23,3 +24,2 @@
- lib/librte_telemetry/rte_telemetry.c          | 12 ++++++------
- lib/librte_telemetry/rte_telemetry_internal.h |  6 +++---
- 2 files changed, 9 insertions(+), 9 deletions(-)
+ lib/librte_telemetry/rte_telemetry.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
@@ -28 +28 @@
-index a4b82c97f..949c63612 100644
+index 7fb247eaa..eceb7e116 100644
@@ -45 +45,8 @@
-@@ -454,8 +454,8 @@ rte_telemetry_encode_json_format(struct telemetry_impl *telemetry,
+@@ -450,10 +450,10 @@ einval_fail:
+ static int32_t
+ rte_telemetry_encode_json_format(struct telemetry_impl *telemetry,
+-	uint32_t *port_ids, uint32_t num_port_ids, uint32_t *metric_ids,
+-	uint32_t num_metric_ids, char **json_buffer)
++	uint32_t *port_ids, int num_port_ids, uint32_t *metric_ids,
++	int num_metric_ids, char **json_buffer)
+ {
@@ -50,12 +56,0 @@
- 	uint32_t port_id;
--	uint32_t num_port_ids;
--	uint32_t num_metric_ids;
-+	int num_port_ids;
-+	int num_metric_ids;
- 
- 	ports = json_array();
-@@ -590,5 +590,5 @@ rte_telemetry_send_ports_stats_values(struct telemetry_encode_param *ep,
- 	char *json_buffer = NULL;
- 	uint32_t port_id;
--	unsigned int i;
-+	int i;
@@ -63,20 +58 @@
- 	if (telemetry == NULL) {
-diff --git a/lib/librte_telemetry/rte_telemetry_internal.h b/lib/librte_telemetry/rte_telemetry_internal.h
-index 6a91d0c44..ce1ee8865 100644
---- a/lib/librte_telemetry/rte_telemetry_internal.h
-+++ b/lib/librte_telemetry/rte_telemetry_internal.h
-@@ -61,11 +61,11 @@ struct telemetry_encode_param {
- 	union {
- 		struct port_param {
--			uint32_t num_metric_ids;
-+			int num_metric_ids;
- 			uint32_t metric_ids[MAX_METRICS];
--			uint32_t num_port_ids;
-+			int num_port_ids;
- 			uint32_t port_ids[RTE_MAX_ETHPORTS];
- 		} pp;
- 		struct global_param {
--			uint32_t num_metric_ids;
-+			int num_metric_ids;
- 			uint32_t metric_ids[MAX_METRICS];
- 		} gp;
+ 	if (num_port_ids <= 0 || num_metric_ids <= 0) {