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 C33D8A034F for ; Tue, 1 Mar 2022 11:43:32 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BE0B4407FF; Tue, 1 Mar 2022 11:43:32 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 1D7AD426DC for ; Tue, 1 Mar 2022 11:43:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646131409; 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=buBZ1yrOADW7mHhiKvz3WWdJ4a+jep49mjSE783EF0s=; b=Wx8INgilEcQXEoRO8sXtiP/TA0xji5hqZAKqb0+AjPBxeYCIcEfgVBSYdk/4pVzRiespQ1 nm3ls2kHYLcSpnGp7FnH6B98Hdl7eaf0Avq1v3oVwVXQ9rRJ4Re6X+vAU1sF3Tu1GFoSke Oq0Y9qxkxb7Uq9CkNANBEnGl1cv/L3k= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-90-800CXiiwO26pO7C2rbAQYg-1; Tue, 01 Mar 2022 05:43:26 -0500 X-MC-Unique: 800CXiiwO26pO7C2rbAQYg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A2A69100C609; Tue, 1 Mar 2022 10:43:25 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id DBD98752BE; Tue, 1 Mar 2022 10:43:23 +0000 (UTC) From: Kevin Traynor To: Brian Dooley Cc: Bruce Richardson , Tyler Retzlaff , dpdk stable Subject: patch 'eventdev: add missing C++ guards' has been queued to stable release 21.11.1 Date: Tue, 1 Mar 2022 10:41:24 +0000 Message-Id: <20220301104300.334382-8-ktraynor@redhat.com> In-Reply-To: <20220301104300.334382-1-ktraynor@redhat.com> References: <20220301104300.334382-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.11.1 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/06/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/e4dbb6873a841365bd0002da3e0825dccdba3b97 Thanks. Kevin --- >From e4dbb6873a841365bd0002da3e0825dccdba3b97 Mon Sep 17 00:00:00 2001 From: Brian Dooley Date: Wed, 16 Feb 2022 15:14:52 +0000 Subject: [PATCH] eventdev: add missing C++ guards [ upstream commit 2c552933ba453984c26262136150d75235f6aabe ] Some public header files were missing 'extern "C"' C++ guards, and couldn't be used by C++ applications. Add the missing guards. Fixes: dc39e2f359b5 ("eventdev: add ring structure for events") Fixes: 7a3357205755 ("lib: remove C++ include guard from private headers") Signed-off-by: Brian Dooley Acked-by: Bruce Richardson Acked-by: Tyler Retzlaff --- lib/eventdev/eventdev_pmd.h | 4 ++++ lib/eventdev/eventdev_pmd_pci.h | 8 ++++++++ lib/eventdev/eventdev_pmd_vdev.h | 8 ++++++++ lib/eventdev/rte_event_ring.h | 9 +++++++++ 4 files changed, 29 insertions(+) diff --git a/lib/eventdev/eventdev_pmd.h b/lib/eventdev/eventdev_pmd.h index d0b0c00a60..ce469d47a6 100644 --- a/lib/eventdev/eventdev_pmd.h +++ b/lib/eventdev/eventdev_pmd.h @@ -6,4 +6,8 @@ #define _RTE_EVENTDEV_PMD_H_ +#ifdef __cplusplus +extern "C" { +#endif + /** @file * RTE Event PMD APIs diff --git a/lib/eventdev/eventdev_pmd_pci.h b/lib/eventdev/eventdev_pmd_pci.h index 499852db16..24b56faaa9 100644 --- a/lib/eventdev/eventdev_pmd_pci.h +++ b/lib/eventdev/eventdev_pmd_pci.h @@ -6,4 +6,8 @@ #define _RTE_EVENTDEV_PMD_PCI_H_ +#ifdef __cplusplus +extern "C" { +#endif + /** @file * RTE Eventdev PCI PMD APIs @@ -151,3 +155,7 @@ rte_event_pmd_pci_remove(struct rte_pci_device *pci_dev, } +#ifdef __cplusplus +} +#endif + #endif /* _RTE_EVENTDEV_PMD_PCI_H_ */ diff --git a/lib/eventdev/eventdev_pmd_vdev.h b/lib/eventdev/eventdev_pmd_vdev.h index d9ee7277dd..77904910a2 100644 --- a/lib/eventdev/eventdev_pmd_vdev.h +++ b/lib/eventdev/eventdev_pmd_vdev.h @@ -6,4 +6,8 @@ #define _RTE_EVENTDEV_PMD_VDEV_H_ +#ifdef __cplusplus +extern "C" { +#endif + /** @file * RTE Eventdev VDEV PMD APIs @@ -100,3 +104,7 @@ rte_event_pmd_vdev_uninit(const char *name) } +#ifdef __cplusplus +} +#endif + #endif /* _RTE_EVENTDEV_PMD_VDEV_H_ */ diff --git a/lib/eventdev/rte_event_ring.h b/lib/eventdev/rte_event_ring.h index c0861b0ec2..0b9aefb000 100644 --- a/lib/eventdev/rte_event_ring.h +++ b/lib/eventdev/rte_event_ring.h @@ -15,4 +15,8 @@ #define _RTE_EVENT_RING_ +#ifdef __cplusplus +extern "C" { +#endif + #include @@ -267,3 +271,8 @@ rte_event_ring_get_capacity(const struct rte_event_ring *r) return rte_ring_get_capacity(&r->r); } + +#ifdef __cplusplus +} +#endif + #endif -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-01 10:41:01.663458435 +0000 +++ 0008-eventdev-add-missing-C-guards.patch 2022-03-01 10:41:01.244244086 +0000 @@ -1 +1 @@ -From 2c552933ba453984c26262136150d75235f6aabe Mon Sep 17 00:00:00 2001 +From e4dbb6873a841365bd0002da3e0825dccdba3b97 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2c552933ba453984c26262136150d75235f6aabe ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ - lib/eventdev/eventdev_pmd.h | 8 ++++++++ + lib/eventdev/eventdev_pmd.h | 4 ++++ @@ -21 +22 @@ - 4 files changed, 33 insertions(+) + 4 files changed, 29 insertions(+) @@ -24 +25 @@ -index b05ffce549..ce469d47a6 100644 +index d0b0c00a60..ce469d47a6 100644 @@ -36,8 +36,0 @@ -@@ -1367,3 +1371,7 @@ event_dev_fp_ops_set(struct rte_event_fp_ops *fp_ops, - const struct rte_eventdev *dev); - -+#ifdef __cplusplus -+} -+#endif -+ - #endif /* _RTE_EVENTDEV_PMD_H_ */ @@ -87 +80 @@ -index 0a54f7fde2..0101cc0aa2 100644 +index c0861b0ec2..0b9aefb000 100644 @@ -99 +92 @@ -@@ -265,3 +269,8 @@ rte_event_ring_get_capacity(const struct rte_event_ring *r) +@@ -267,3 +271,8 @@ rte_event_ring_get_capacity(const struct rte_event_ring *r)