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 7C42BA0350 for ; Mon, 28 Feb 2022 22:21:11 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 73F3640140; Mon, 28 Feb 2022 22:21:11 +0100 (CET) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mails.dpdk.org (Postfix) with ESMTP id EB66A40140 for ; Mon, 28 Feb 2022 22:21:08 +0100 (CET) Received: by mail-wr1-f45.google.com with SMTP id s13so17443983wrb.6 for ; Mon, 28 Feb 2022 13:21:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=blHgQLs5LkI+wc1g3WTQdFmzpHd1z540vZ0hGacg8DM=; b=KcZFxLFIMU6kIPxIMhLIQ4J447+KmcgE9ZPO1ZHgXiA4/HUdOao6e1AuCwpRRuSHmd vJu+VeRAaVZDETqEzVKJlhzDzKv98qnrztpmzEZNJYpXdOGdTkTVx4Kcdhm+7uDvXCNW T7GB9XT8PNQ+oBtqHRw2uLC3LcWBKCRyu61wcEb2rI3GGT2FRo7W5rnG3SPFtzkXv5tK zQBSA777ugfbwGFz8nFZu6/GC+a1rNB+RTxJCwjndRJOapNmYRpg70EXKvDm8UtyyFma k0pSloSmb6sM56jt2uHa/WEV2q1jdCiSNOyUfWR4SyaKdw2VZprVKd1p7GFswAId0mO8 Ky6Q== 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=blHgQLs5LkI+wc1g3WTQdFmzpHd1z540vZ0hGacg8DM=; b=TfDSq24gPUl3FC5C2Pd7s3qXMp+TZtrQugi5/HD5E6B9v+A4L8DOTPGH/vUFqvpfsb fKyrpIg3/CpRhSKK5lp8Ptq5ZMxhYHqI+fCHlrUajIQrCDxt2ta6ZNoKbXMbAg+LvKGd SNm94cdBD8aB67gx1Z1Z05Mxk433me+Xe/M9ClDNAyzdUfpbZwBXHh4CSLdD6//x804i 7Bh8i+PTLLe5udvjEDd/qg6/zw6rCM+LvfCJjt3++0k1Ic4gA5vyORv27AoCkYMN3ZTy ZtFy+uWVBNicWlBXPj7ykGSW5QCqdaHKL8SizYZwtV068W9MsaYdHv1wI/uptoQ5+CAY BIFg== X-Gm-Message-State: AOAM5320AR3mxMpfRUKAIbN4wPLS6+tRagHz3C9dS6Ud+Y2Qh+Sqn9Sc Ml1xa25GCqMX3nbWCh/hCbAX+pmMTbeexA== X-Google-Smtp-Source: ABdhPJzJFIQx+NKJVxHDYtvB4MBPaGptgwFbev/IISzdT3vieuZSgioNe7N4V6FV9Y+AJsaPI/ZolQ== X-Received: by 2002:adf:ebc1:0:b0:1e6:1109:5a1c with SMTP id v1-20020adfebc1000000b001e611095a1cmr17202905wrn.228.1646083268636; Mon, 28 Feb 2022 13:21:08 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id f18-20020a05600c155200b003816bac83f6sm633081wmg.27.2022.02.28.13.21.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 13:21:08 -0800 (PST) From: luca.boccassi@gmail.com To: Brian Dooley Cc: Bruce Richardson , Tyler Retzlaff , dpdk stable Subject: patch 'eventdev: add missing C++ guards' has been queued to stable release 20.11.5 Date: Mon, 28 Feb 2022 21:20:04 +0000 Message-Id: <20220228212047.3341966-8-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220228212047.3341966-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-122-luca.boccassi@gmail.com> <20220228212047.3341966-1-luca.boccassi@gmail.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 20.11.5 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/02/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/9c5dd18e1878a78c3733ca4089f91bfe1c610142 Thanks. Luca Boccassi --- >From 9c5dd18e1878a78c3733ca4089f91bfe1c610142 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 c0861b0ec2..0b9aefb000 100644 --- a/lib/librte_eventdev/rte_event_ring.h +++ b/lib/librte_eventdev/rte_event_ring.h @@ -14,6 +14,10 @@ #ifndef _RTE_EVENT_RING_ #define _RTE_EVENT_RING_ +#ifdef __cplusplus +extern "C" { +#endif + #include #include @@ -266,4 +270,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 5e1c836eb7..31d11f6f02 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 * @@ -1142,4 +1146,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 5f238bf496..e3b5e6e86e 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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-28 21:17:54.640943058 +0000 +++ 0008-eventdev-add-missing-C-guards.patch 2022-02-28 21:17:53.808928529 +0000 @@ -1 +1 @@ -From 2c552933ba453984c26262136150d75235f6aabe Mon Sep 17 00:00:00 2001 +From 9c5dd18e1878a78c3733ca4089f91bfe1c610142 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 c0861b0ec2..0b9aefb000 100644 +--- a/lib/librte_eventdev/rte_event_ring.h ++++ b/lib/librte_eventdev/rte_event_ring.h +@@ -14,6 +14,10 @@ + #ifndef _RTE_EVENT_RING_ + #define _RTE_EVENT_RING_ + ++#ifdef __cplusplus ++extern "C" { ++#endif ++ + #include + + #include +@@ -266,4 +270,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 5e1c836eb7..31d11f6f02 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); +@@ -1142,4 +1146,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 5f238bf496..e3b5e6e86e 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