From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 91023A04FA for ; Wed, 5 Feb 2020 18:06:48 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 855E21C2F4; Wed, 5 Feb 2020 18:06:48 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id D16BA1C2F4 for ; Wed, 5 Feb 2020 18:06:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580922407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WqavjxizRJpbM08LKcxFdhnZBsvWoKSm+H5R1cJmD/4=; b=fInldIyILKMsPkDkoxyKyxsYHNRlsC588twb3Yg/youGscqH5Ag5uu9ZJ8ZxwB+lsbCdOH qqVM7AMSDORW3C8eIEjNBAdEEhVOWd8SjaLfriT0WRTDw6NEnaDHxP87JS8W8HWCAmvYXj nOViLnhM2J0qM/0qm+TiuZrM0jfldXg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-428-vtgviUNeM5yi6hZbExNbjw-1; Wed, 05 Feb 2020 12:06:27 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D6D7A97856; Wed, 5 Feb 2020 17:06:26 +0000 (UTC) Received: from aldebaran.drizzt.lan (dhcp19-189-71.ntdv.lab.eng.bos.redhat.com [10.19.189.71]) by smtp.corp.redhat.com (Postfix) with ESMTP id A53971C94B; Wed, 5 Feb 2020 17:06:25 +0000 (UTC) From: Timothy Redaelli To: dev@dpdk.org Cc: stable@dpdk.org, jasvinder.singh@intel.com Date: Wed, 5 Feb 2020 18:05:46 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: vtgviUNeM5yi6hZbExNbjw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] [PATCH 3/3] examples/qos_sched: fix building with GCC 10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 flexibili= ty") Cc: jasvinder.singh@intel.com Cc: stable@dpdk.org Signed-off-by: Timothy Redaelli --- 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 =20 +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; =20 -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; =20 extern struct rte_sched_port_params port_params; extern struct rte_sched_subport_params subport_params[MAX_SCHED_SUBPORTS]; --=20 2.24.1