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 02DA1A0093 for ; Wed, 9 Mar 2022 12:01:46 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F1D5E410F3; Wed, 9 Mar 2022 12:01:45 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 34B2D410EF for ; Wed, 9 Mar 2022 12:01:44 +0100 (CET) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (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-0.canonical.com (Postfix) with ESMTPS id 04C973F613 for ; Wed, 9 Mar 2022 11:01:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646823704; bh=WMkA3/pFGLR+O1GVoYicBy9A2ZS9UR5dWvUGQjLrE0Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=IKHZryC+HeXK9G/DWaweXWOep8LOdiZnw3sHNYg/KxXP3a+m2SXTuiB36fGaVXvSJ qpyYChQMouObzMst/5PUwfv7Gn0snWKlGrA+lzIpiHGTlgjx0G8llXv4S1G8MTXfb6 LtNpdgrmoZ1k3rzFAPs3LU4NJjLMS83IAV7WvRzHk1m3iMgR/A2Ew1k/Dj7yE8DUib Sz7+HtQK+9ousBzRDtv9av7ZAQysaJS7EdicArVg0aIjxiJkc0Ml0c49jezWhmHmOk LzP8ItowV9CqjsGrl8WIAUjzgBch3LLjHjcYz0s76CwYK6+A9RGqREC7+4O6b3BP/q cioyu2jtGwPGA== Received: by mail-wm1-f70.google.com with SMTP id z9-20020a7bc7c9000000b00389bd375677so827356wmk.4 for ; Wed, 09 Mar 2022 03:01:43 -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=WMkA3/pFGLR+O1GVoYicBy9A2ZS9UR5dWvUGQjLrE0Q=; b=lA/Tod4jKet6CM44fJJyea5TZPmAo63jhWzXNFj1H9dG0IcqNpaeu3TY7vhd9KWM1H dzRfv+v+So+i4sKvBOHkyNuE9HYbkXSe8IeRl7xvOLwhH8S99W654szAisL12TuiNVjE RnM+oL3k9xB8TdZptYrN1ah0f+kFoij7460YnEkpBl1faISKE6X5snzKnO0oo0gggg+X GPGqVoK6AWCqFVI3gRTk0HD4/k97/V+JZ6Tc9RA80ykP0n8RQJQAwkfnZI/2dTDdca2a zPOq1bvJ5eYtMLn03PMHCguJ120As4xPBwCUoVt6RJOlZ5rpXF9S95xc6nOBInP4JOPF Mzqw== X-Gm-Message-State: AOAM533m7xmcH3pOrvxWdN5YO7JVKJDFMP4UG0acxjJEPliSqCay1PZ9 dxM71m7tppDfFInlAy9zr3SaKcJ4GF3V/FLhgumzRiAIh6zntbyvsyEnS8d+/lQprEps/BkiKln DIG2zmSzMmTPU/pekvhw1Akqb X-Received: by 2002:a05:600c:588:b0:389:9e5f:59d3 with SMTP id o8-20020a05600c058800b003899e5f59d3mr7060206wmd.35.1646823703012; Wed, 09 Mar 2022 03:01:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJxVJE/ILVJbp89Nkxtveo2Dgiw0XSx93StBos2WVU0er9iE0rp4vQTEcZD3JZwKB2VlQqjHtw== X-Received: by 2002:a05:600c:588:b0:389:9e5f:59d3 with SMTP id o8-20020a05600c058800b003899e5f59d3mr7060185wmd.35.1646823702748; Wed, 09 Mar 2022 03:01:42 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 03:01:42 -0800 (PST) From: christian.ehrhardt@canonical.com To: Brian Dooley Cc: Bruce Richardson , Tyler Retzlaff , dpdk stable Subject: patch 'eventdev: add missing C++ guards' has been queued to stable release 19.11.12 Date: Wed, 9 Mar 2022 12:00:36 +0100 Message-Id: <20220309110116.1295395-5-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/5d5711a19a1a975ec86948db1aa8896ea2f27bc8 Thanks. Christian Ehrhardt --- >From 5d5711a19a1a975ec86948db1aa8896ea2f27bc8 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/librte_eventdev/rte_event_ring.h | 9 +++++++++ lib/librte_eventdev/rte_eventdev_pmd.h | 8 ++++++++ lib/librte_eventdev/rte_eventdev_pmd_pci.h | 4 ++++ lib/librte_eventdev/rte_eventdev_pmd_vdev.h | 4 ++++ 4 files changed, 25 insertions(+) diff --git a/lib/librte_eventdev/rte_event_ring.h b/lib/librte_eventdev/rte_event_ring.h index 827a3209ea..f76e508c54 100644 --- a/lib/librte_eventdev/rte_event_ring.h +++ b/lib/librte_eventdev/rte_event_ring.h @@ -13,6 +13,10 @@ #ifndef _RTE_EVENT_RING_ #define _RTE_EVENT_RING_ +#ifdef __cplusplus +extern "C" { +#endif + #include #include @@ -275,4 +279,9 @@ rte_event_ring_get_capacity(const struct rte_event_ring *r) { return rte_ring_get_capacity(&r->r); } + +#ifdef __cplusplus +} +#endif + #endif diff --git a/lib/librte_eventdev/rte_eventdev_pmd.h b/lib/librte_eventdev/rte_eventdev_pmd.h index ec77e65f29..2ecdd56308 100644 --- a/lib/librte_eventdev/rte_eventdev_pmd.h +++ b/lib/librte_eventdev/rte_eventdev_pmd.h @@ -5,6 +5,10 @@ #ifndef _RTE_EVENTDEV_PMD_H_ #define _RTE_EVENTDEV_PMD_H_ +#ifdef __cplusplus +extern "C" { +#endif + /** @file * RTE Event PMD APIs * @@ -1112,4 +1116,8 @@ rte_event_pmd_release(struct rte_eventdev *eventdev); } #endif +#ifdef __cplusplus +} +#endif + #endif /* _RTE_EVENTDEV_PMD_H_ */ diff --git a/lib/librte_eventdev/rte_eventdev_pmd_pci.h b/lib/librte_eventdev/rte_eventdev_pmd_pci.h index 443cd38c23..92eeed6411 100644 --- a/lib/librte_eventdev/rte_eventdev_pmd_pci.h +++ b/lib/librte_eventdev/rte_eventdev_pmd_pci.h @@ -5,6 +5,10 @@ #ifndef _RTE_EVENTDEV_PMD_PCI_H_ #define _RTE_EVENTDEV_PMD_PCI_H_ +#ifdef __cplusplus +extern "C" { +#endif + /** @file * RTE Eventdev PCI PMD APIs * diff --git a/lib/librte_eventdev/rte_eventdev_pmd_vdev.h b/lib/librte_eventdev/rte_eventdev_pmd_vdev.h index 8c64a06743..ff79d82530 100644 --- a/lib/librte_eventdev/rte_eventdev_pmd_vdev.h +++ b/lib/librte_eventdev/rte_eventdev_pmd_vdev.h @@ -5,6 +5,10 @@ #ifndef _RTE_EVENTDEV_PMD_VDEV_H_ #define _RTE_EVENTDEV_PMD_VDEV_H_ +#ifdef __cplusplus +extern "C" { +#endif + /** @file * RTE Eventdev VDEV PMD APIs * -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 11:57:43.667139495 +0100 +++ 0005-eventdev-add-missing-C-guards.patch 2022-03-09 11:57:43.316937904 +0100 @@ -1 +1 @@ -From 2c552933ba453984c26262136150d75235f6aabe Mon Sep 17 00:00:00 2001 +From 5d5711a19a1a975ec86948db1aa8896ea2f27bc8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2c552933ba453984c26262136150d75235f6aabe ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -17,5 +18,5 @@ - lib/eventdev/eventdev_pmd.h | 8 ++++++++ - lib/eventdev/eventdev_pmd_pci.h | 8 ++++++++ - lib/eventdev/eventdev_pmd_vdev.h | 8 ++++++++ - lib/eventdev/rte_event_ring.h | 9 +++++++++ - 4 files changed, 33 insertions(+) + lib/librte_eventdev/rte_event_ring.h | 9 +++++++++ + lib/librte_eventdev/rte_eventdev_pmd.h | 8 ++++++++ + lib/librte_eventdev/rte_eventdev_pmd_pci.h | 4 ++++ + lib/librte_eventdev/rte_eventdev_pmd_vdev.h | 4 ++++ + 4 files changed, 25 insertions(+) @@ -23,4 +24,29 @@ -diff --git a/lib/eventdev/eventdev_pmd.h b/lib/eventdev/eventdev_pmd.h -index b05ffce549..ce469d47a6 100644 ---- a/lib/eventdev/eventdev_pmd.h -+++ b/lib/eventdev/eventdev_pmd.h +diff --git a/lib/librte_eventdev/rte_event_ring.h b/lib/librte_eventdev/rte_event_ring.h +index 827a3209ea..f76e508c54 100644 +--- a/lib/librte_eventdev/rte_event_ring.h ++++ b/lib/librte_eventdev/rte_event_ring.h +@@ -13,6 +13,10 @@ + #ifndef _RTE_EVENT_RING_ + #define _RTE_EVENT_RING_ + ++#ifdef __cplusplus ++extern "C" { ++#endif ++ + #include + + #include +@@ -275,4 +279,9 @@ rte_event_ring_get_capacity(const struct rte_event_ring *r) + { + return rte_ring_get_capacity(&r->r); + } ++ ++#ifdef __cplusplus ++} ++#endif ++ + #endif +diff --git a/lib/librte_eventdev/rte_eventdev_pmd.h b/lib/librte_eventdev/rte_eventdev_pmd.h +index ec77e65f29..2ecdd56308 100644 +--- a/lib/librte_eventdev/rte_eventdev_pmd.h ++++ b/lib/librte_eventdev/rte_eventdev_pmd.h @@ -38,3 +64,3 @@ -@@ -1366,4 +1370,8 @@ void - event_dev_fp_ops_set(struct rte_event_fp_ops *fp_ops, - const struct rte_eventdev *dev); +@@ -1112,4 +1116,8 @@ rte_event_pmd_release(struct rte_eventdev *eventdev); + } + #endif @@ -47,4 +73,4 @@ -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 +diff --git a/lib/librte_eventdev/rte_eventdev_pmd_pci.h b/lib/librte_eventdev/rte_eventdev_pmd_pci.h +index 443cd38c23..92eeed6411 100644 +--- a/lib/librte_eventdev/rte_eventdev_pmd_pci.h ++++ b/lib/librte_eventdev/rte_eventdev_pmd_pci.h @@ -62,13 +88,4 @@ -@@ -150,4 +154,8 @@ rte_event_pmd_pci_remove(struct rte_pci_device *pci_dev, - return 0; - } - -+#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 +diff --git a/lib/librte_eventdev/rte_eventdev_pmd_vdev.h b/lib/librte_eventdev/rte_eventdev_pmd_vdev.h +index 8c64a06743..ff79d82530 100644 +--- a/lib/librte_eventdev/rte_eventdev_pmd_vdev.h ++++ b/lib/librte_eventdev/rte_eventdev_pmd_vdev.h @@ -86,34 +102,0 @@ -@@ -99,4 +103,8 @@ rte_event_pmd_vdev_uninit(const char *name) - return 0; - } - -+#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 0a54f7fde2..0101cc0aa2 100644 ---- a/lib/eventdev/rte_event_ring.h -+++ b/lib/eventdev/rte_event_ring.h -@@ -14,6 +14,10 @@ - #ifndef _RTE_EVENT_RING_ - #define _RTE_EVENT_RING_ - -+#ifdef __cplusplus -+extern "C" { -+#endif -+ - #include - - #include -@@ -264,4 +268,9 @@ rte_event_ring_get_capacity(const struct rte_event_ring *r) - { - return rte_ring_get_capacity(&r->r); - } -+ -+#ifdef __cplusplus -+} -+#endif -+ - #endif