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 A47DDA0093 for ; Wed, 9 Mar 2022 12:01:32 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9C95E40687; Wed, 9 Mar 2022 12:01:32 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 0A72140687 for ; Wed, 9 Mar 2022 12:01:32 +0100 (CET) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 4D6B03F79D for ; Wed, 9 Mar 2022 11:01:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646823691; bh=Q4GbqviXk2OD3US1TUqKdzfQ48Q/Q1LUzaSh0vmExos=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iNI/AZr2lpSlm4J4FMVRws4R6mDEkDquwTWVCHaXYWbD1XsGjWwyI0C//ES/xfWs/ grQCt5BYniyJExy7NsYAvyfQL27q9pgANwt+QbCP5BKZsCUL7TRY6FwYGYyrxNni3m aHmKheXZw1HKCPupS5vzxOmqbN6dIPwRFNuBen13Ssko2GHA81Qp3+ZJDweaXJDGQA 7h3tX5xA/hsfgsEJLwqj6M2yK8vrWjI10i1qjNzhgVkMnziv+9tmWKzHm+IxNeqRyo fjgjoM4K3JdxQabZKJZ7X8FV+sA1PayqwHWzDsrQoRB8J0he+7UD7iTJewkJYdMiQG xuXYZbiR/mUNg== Received: by mail-wm1-f71.google.com with SMTP id h206-20020a1c21d7000000b003552c13626cso2451107wmh.3 for ; Wed, 09 Mar 2022 03:01:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Q4GbqviXk2OD3US1TUqKdzfQ48Q/Q1LUzaSh0vmExos=; b=Lyco+0ssO+1qWfJagSFRMlOyMcQD+MzXWvYC5SwAwIoYZuPutEfvm27Zq5YimJIXGm fKz8DDVpFs3CahmSeEhX92ZuvR2opdIj8xOQJgr/F4PmD/VMBUkBXB9h0str3KIBVei+ gCE1ELQ8a8BQ/csZnjEyD+WfvSDIB6teUU2H7cC9YkyzI3k1EkU3sWjwpK4cPN4lHsoQ vzezJou0aaxSsR13Z2mIln3+7Nrj7kMYHtVxz9RaNVaxKkqnuqs9i/wmg3NTZy+a1EDd QGjxdAykplguun2D9TXrAQFHLXM99aekAQEy1QbXxL0wkfX7D+gdsoG4PtrIu7Tm7KiZ XzUw== X-Gm-Message-State: AOAM530zxSBstESWmHND7ZHQ3pVpCe3uhIcy7ER/gyhgDO+wN55lE5a0 CnK1ffs3ELiZd/iLKlc7jr7/85DD1EAWKyhnndpTeHlaorlOqp4fBOs756YjTk5AEuJ9+6fkA3N eumPlZIKhpipf7RvqhLV+41SZ X-Received: by 2002:a05:600c:42d6:b0:389:868e:8638 with SMTP id j22-20020a05600c42d600b00389868e8638mr7058753wme.178.1646823690924; Wed, 09 Mar 2022 03:01:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJwmyhS/8IpF3Qca3n0wcMj1C8PvvzYq6yvU869UNJ5XvBOP/2fODIAbEdEe9bNF5SJtuFG4DQ== X-Received: by 2002:a05:600c:42d6:b0:389:868e:8638 with SMTP id j22-20020a05600c42d600b00389868e8638mr7058707wme.178.1646823690299; Wed, 09 Mar 2022 03:01:30 -0800 (PST) Received: from localhost.localdomain (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id h36-20020a05600c49a400b00382aa0b1619sm1412438wmp.45.2022.03.09.03.01.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 03:01:29 -0800 (PST) From: christian.ehrhardt@canonical.com To: Brian Dooley Cc: Bruce Richardson , Tyler Retzlaff , dpdk stable Subject: patch 'telemetry: add missing C++ guards' has been queued to stable release 19.11.12 Date: Wed, 9 Mar 2022 12:00:33 +0100 Message-Id: <20220309110116.1295395-2-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220309110116.1295395-1-christian.ehrhardt@canonical.com> References: <20220309110116.1295395-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 19.11.12 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/11/22. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/c7b95a425e597c13503f007c1285138429462841 Thanks. Christian Ehrhardt --- >From c7b95a425e597c13503f007c1285138429462841 Mon Sep 17 00:00:00 2001 From: Brian Dooley Date: Wed, 16 Feb 2022 15:14:47 +0000 Subject: [PATCH] telemetry: add missing C++ guards [ upstream commit cf8e6263647d217ad5c9bdfa2c3275f71bd19f64 ] Some public header files were missing 'extern "C"' C++ guards, and couldn't be used by C++ applications. Add the missing guards. Fixes: 8877ac688b52 ("telemetry: introduce infrastructure") Signed-off-by: Brian Dooley Acked-by: Bruce Richardson Acked-by: Tyler Retzlaff --- lib/librte_telemetry/rte_telemetry.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/librte_telemetry/rte_telemetry.h b/lib/librte_telemetry/rte_telemetry.h index f1376ea35f..a5ff0e75f3 100644 --- a/lib/librte_telemetry/rte_telemetry.h +++ b/lib/librte_telemetry/rte_telemetry.h @@ -7,6 +7,10 @@ #ifndef _RTE_TELEMETRY_H_ #define _RTE_TELEMETRY_H_ +#ifdef __cplusplus +extern "C" { +#endif + /** * @file * @@ -71,4 +75,8 @@ __rte_experimental int32_t rte_telemetry_selftest(void); +#ifdef __cplusplus +} +#endif + #endif -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 11:57:43.522656279 +0100 +++ 0002-telemetry-add-missing-C-guards.patch 2022-03-09 11:57:43.312937879 +0100 @@ -1 +1 @@ -From cf8e6263647d217ad5c9bdfa2c3275f71bd19f64 Mon Sep 17 00:00:00 2001 +From c7b95a425e597c13503f007c1285138429462841 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cf8e6263647d217ad5c9bdfa2c3275f71bd19f64 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - lib/telemetry/rte_telemetry.h | 8 ++++++++ + lib/librte_telemetry/rte_telemetry.h | 8 ++++++++ @@ -19,5 +20,5 @@ -diff --git a/lib/telemetry/rte_telemetry.h b/lib/telemetry/rte_telemetry.h -index 7bca8a9a49..3372b32f38 100644 ---- a/lib/telemetry/rte_telemetry.h -+++ b/lib/telemetry/rte_telemetry.h -@@ -9,6 +9,10 @@ +diff --git a/lib/librte_telemetry/rte_telemetry.h b/lib/librte_telemetry/rte_telemetry.h +index f1376ea35f..a5ff0e75f3 100644 +--- a/lib/librte_telemetry/rte_telemetry.h ++++ b/lib/librte_telemetry/rte_telemetry.h +@@ -7,6 +7,10 @@ @@ -31,6 +32,6 @@ - /** Maximum length for string used in object. */ - #define RTE_TEL_MAX_STRING_LEN 128 - /** Maximum length of string. */ -@@ -294,4 +298,8 @@ rte_tel_data_alloc(void); - void - rte_tel_data_free(struct rte_tel_data *data); + /** + * @file + * +@@ -71,4 +75,8 @@ __rte_experimental + int32_t + rte_telemetry_selftest(void);