[dpdk-stable] patch 'examples/qos_sched: fix build with gcc 10' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 05/21/20. 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 25fe1c8b05f2dca60f95bda58ea988177964fe27 Mon Sep 17 00:00:00 2001
From: Timothy Redaelli <tredaelli at redhat.com>
Date: Wed, 5 Feb 2020 18:05:46 +0100
Subject: [PATCH] examples/qos_sched: fix build with gcc 10

[ upstream commit 345187bda58f2685e34a00c7bca917637395aad4 ]

GCC 10 defaults to -fno-common, this means a linker error will now be
reported if the same global variable is defined in more than one
compilation unit.

Fixes: be1e533238c0 ("examples/qos_sched: add TC and queue config flexibility")

Signed-off-by: Timothy Redaelli <tredaelli at redhat.com>
Acked-by: David Marchand <david.marchand at redhat.com>
---
 examples/qos_sched/cfg_file.c | 3 +++
 examples/qos_sched/main.h     | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/examples/qos_sched/cfg_file.c b/examples/qos_sched/cfg_file.c
index 5714c3f36d..f078e4f7de 100644
--- a/examples/qos_sched/cfg_file.c
+++ b/examples/qos_sched/cfg_file.c
@@ -20,6 +20,9 @@
  * for new entries do we add in */
 #define CFG_ALLOC_ENTRY_BATCH 16
 
+uint32_t active_queues[RTE_SCHED_QUEUES_PER_PIPE];
+uint32_t n_active_queues;
+
 int
 cfg_load_port(struct rte_cfgfile *cfg, struct rte_sched_port_params *port_params)
 {
diff --git a/examples/qos_sched/main.h b/examples/qos_sched/main.h
index baa2b3eadc..23bc418d97 100644
--- a/examples/qos_sched/main.h
+++ b/examples/qos_sched/main.h
@@ -148,8 +148,8 @@ extern struct burst_conf burst_conf;
 extern struct ring_thresh rx_thresh;
 extern struct ring_thresh tx_thresh;
 
-uint32_t active_queues[RTE_SCHED_QUEUES_PER_PIPE];
-uint32_t n_active_queues;
+extern uint32_t active_queues[RTE_SCHED_QUEUES_PER_PIPE];
+extern uint32_t n_active_queues;
 
 extern struct rte_sched_port_params port_params;
 extern struct rte_sched_subport_params subport_params[MAX_SCHED_SUBPORTS];
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 13:56:19.093198953 +0100
+++ 0006-examples-qos_sched-fix-build-with-gcc-10.patch	2020-05-19 13:56:18.171500955 +0100
@@ -1,14 +1,15 @@
-From 345187bda58f2685e34a00c7bca917637395aad4 Mon Sep 17 00:00:00 2001
+From 25fe1c8b05f2dca60f95bda58ea988177964fe27 Mon Sep 17 00:00:00 2001
 From: Timothy Redaelli <tredaelli at redhat.com>
 Date: Wed, 5 Feb 2020 18:05:46 +0100
 Subject: [PATCH] examples/qos_sched: fix build with gcc 10
 
+[ upstream commit 345187bda58f2685e34a00c7bca917637395aad4 ]
+
 GCC 10 defaults to -fno-common, this means a linker error will now be
 reported if the same global variable is defined in more than one
 compilation unit.
 
 Fixes: be1e533238c0 ("examples/qos_sched: add TC and queue config flexibility")
-Cc: stable at dpdk.org
 
 Signed-off-by: Timothy Redaelli <tredaelli at redhat.com>
 Acked-by: David Marchand <david.marchand at redhat.com>