patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Timothy Redaelli <tredaelli@redhat.com>
To: dev@dpdk.org
Cc: stable@dpdk.org, jasvinder.singh@intel.com
Subject: [dpdk-stable] [PATCH 3/3] examples/qos_sched: fix building with GCC 10
Date: Wed,  5 Feb 2020 18:05:46 +0100	[thread overview]
Message-ID: <eefbbb16566defd52c544cae7804f25c7e37ce03.1580921206.git.tredaelli@redhat.com> (raw)
In-Reply-To: <cover.1580910264.git.tredaelli@redhat.com>

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: jasvinder.singh@intel.com
Cc: stable@dpdk.org
Signed-off-by: Timothy Redaelli <tredaelli@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 5714c3f36..f078e4f7d 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 baa2b3ead..23bc418d9 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.24.1


  parent reply	other threads:[~2020-02-05 17:06 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-05 13:47 [dpdk-stable] [PATCH 0/3] examples: " Timothy Redaelli
2020-02-05 13:47 ` [dpdk-stable] [PATCH 1/3] examples/vhost_blk: " Timothy Redaelli
2020-02-05 15:12   ` [dpdk-stable] [dpdk-dev] " Maxime Coquelin
2020-02-05 14:12 ` [dpdk-stable] [PATCH v2 3/3] app/test-pipeline: " Timothy Redaelli
2020-02-05 14:21   ` Dumitrescu, Cristian
2020-02-05 17:05 ` [dpdk-stable] [PATCH 2/3] examples/eventdev_pipeline: " Timothy Redaelli
2020-02-05 17:05 ` Timothy Redaelli [this message]
2020-03-04  9:37 ` [dpdk-stable] [dpdk-dev] [PATCH 0/3] examples: " David Marchand
2020-03-04 10:17   ` David Marchand

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=eefbbb16566defd52c544cae7804f25c7e37ce03.1580921206.git.tredaelli@redhat.com \
    --to=tredaelli@redhat.com \
    --cc=dev@dpdk.org \
    --cc=jasvinder.singh@intel.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).