From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 91B83A0A02; Fri, 15 Jan 2021 12:13:00 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8A038140FA0; Fri, 15 Jan 2021 12:11:58 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id 1E6BA140F89; Fri, 15 Jan 2021 12:11:55 +0100 (CET) IronPort-SDR: ohSHTnsl1TNaUr+oi8R6rz1c5f/JlPFcuB+Qa2usku9aW4ozv5DPP411cw36CUhkP/nhzCB8OW x6JANHc5Pq9w== X-IronPort-AV: E=McAfee;i="6000,8403,9864"; a="175954136" X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="175954136" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2021 03:11:55 -0800 IronPort-SDR: xQDIiupAcq30ejdAsUrM6BxNsbQmQVnxg+IJDM2qkURTzjABpak0MLubJA2cF/Iv2FidTLJucg p/B5mMGuRXqw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,349,1602572400"; d="scan'208";a="401252898" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga002.fm.intel.com with ESMTP; 15 Jan 2021 03:11:53 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , stable@dpdk.org, Ciara Power , Keith Wiles Date: Fri, 15 Jan 2021 11:10:45 +0000 Message-Id: <20210115111052.16437-14-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210115111052.16437-1-bruce.richardson@intel.com> References: <20210114110606.21142-1-bruce.richardson@intel.com> <20210115111052.16437-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 13/19] metrics: fix variable declaration in header X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The global variable "tel_met_data" was declared in a header file, rather than in a C file, leading to duplicate definitions if more than one C file included the header. Fixes: c5b7197f662e ("telemetry: move some functions to metrics library") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson --- lib/librte_metrics/rte_metrics_telemetry.c | 2 ++ lib/librte_metrics/rte_metrics_telemetry.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_metrics/rte_metrics_telemetry.c b/lib/librte_metrics/rte_metrics_telemetry.c index 901cbeb0a3..b8ee56ef01 100644 --- a/lib/librte_metrics/rte_metrics_telemetry.c +++ b/lib/librte_metrics/rte_metrics_telemetry.c @@ -13,6 +13,8 @@ #include "rte_metrics.h" #include "rte_metrics_telemetry.h" +struct telemetry_metrics_data tel_met_data; + int metrics_log_level; /* Logging Macros */ diff --git a/lib/librte_metrics/rte_metrics_telemetry.h b/lib/librte_metrics/rte_metrics_telemetry.h index 3435a55425..5dbb32ca0c 100644 --- a/lib/librte_metrics/rte_metrics_telemetry.h +++ b/lib/librte_metrics/rte_metrics_telemetry.h @@ -34,8 +34,6 @@ struct telemetry_metrics_data { int metrics_register_done; }; -struct telemetry_metrics_data tel_met_data; - __rte_experimental int32_t rte_metrics_tel_reg_all_ethdev(int *metrics_register_done, int *reg_index_list); -- 2.27.0