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 F1524A0350 for ; Mon, 28 Feb 2022 22:20:55 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EC8DA4068C; Mon, 28 Feb 2022 22:20:55 +0100 (CET) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mails.dpdk.org (Postfix) with ESMTP id 4F74B411B5 for ; Mon, 28 Feb 2022 22:20:54 +0100 (CET) Received: by mail-wm1-f41.google.com with SMTP id 6-20020a05600c024600b0038125fa8e43so481157wmj.0 for ; Mon, 28 Feb 2022 13:20:54 -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=+IdncnX7yl8cxdNtzA0gercDWuteD3dpCP4O71AgOn8=; b=bXE5mB9Y86e796rnScW0PwaShMuNujNFc95tKqXLDmiKOMtmm2youtlM2ltNqetoXp sJYDnbsGAl9c773tYIA9uEwZhTq6bDPDyu7XWFFIxQawI8+L0+AiSFBp1nvO6CorqZun ZOCoXCBCR88mkKzdevKCkFQUDPe3p+ddWJAaxLo6+xOMID56NIn7J6EeqxO2tuLKDzxY UezUJCR3xCa5oQCteG6OweO6gx3lypWmQheNUll9PPzeuANKH6pRzX98GDGMIOC9txRi qi9GrTN8IFMQAB1+Rqx7SOEl2k502D3K6j2r2+rR5riFYDH8VcXPc69PItR9uJ3aM9HX Uw2w== 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=+IdncnX7yl8cxdNtzA0gercDWuteD3dpCP4O71AgOn8=; b=0Sqyou+/yR/Ag5KDwxxrrExPD6NczWTjtwTBxMXUYsYStlYNvxzfYKm5SPfaJrXko1 xKJVVACf4lff29gBp2PRZIIz6YbtOeEIc3Cm5WGPdHwGa+jILD8YA0oxEH1DWHOX4XLM ni8cPmerhL8TDSeu5bQlEned9QJGJeSjC7JO/0vRs+HhMy9sBK88lVa54VuheXDCAEDJ UuI2+Z247g5hHD2pVvkDUgaTzBEljNhGf1lu2vzNRJJ+E6zDdegtlCQv1qLWEwzT5drq yVybrkvnHRaB6Xi6kIWVXxdDaQHmmN7Hf37wVUG+UKmT/VsBeg0hqiEdslOWoEYwX0kM 7cgQ== X-Gm-Message-State: AOAM533R0X9HAavDoLnmvQjyOIf8z8436uldCKnsMB8vkgEO55kTWOZq rakadZeReMvae66qI0EOluSficB+GeurAg== X-Google-Smtp-Source: ABdhPJy3ALXAlML3sZ2nYgyHiWqhlLBZ5hs5SiRNJITUFE04yZVxkYgE1P8Uxm0kKRyK9A8WnZP0CA== X-Received: by 2002:a05:600c:1d15:b0:381:1979:a7dd with SMTP id l21-20020a05600c1d1500b003811979a7ddmr14943977wms.137.1646083253958; Mon, 28 Feb 2022 13:20:53 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id r15-20020a05600c35cf00b003808165fbc2sm655256wmq.25.2022.02.28.13.20.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 13:20:53 -0800 (PST) From: luca.boccassi@gmail.com To: Brian Dooley Cc: Bruce Richardson , Tyler Retzlaff , dpdk stable Subject: patch 'ethdev: add missing C++ guards' has been queued to stable release 20.11.5 Date: Mon, 28 Feb 2022 21:20:00 +0000 Message-Id: <20220228212047.3341966-4-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/c840104e2394624680b36d9498367f2138ca1828 Thanks. Luca Boccassi --- >From c840104e2394624680b36d9498367f2138ca1828 Mon Sep 17 00:00:00 2001 From: Brian Dooley Date: Wed, 16 Feb 2022 15:14:48 +0000 Subject: [PATCH] ethdev: add missing C++ guards [ upstream commit dbf9fc1dac70b64dd1ed9a3ffd6997838fbf170e ] Some public header files were missing 'extern "C"' C++ guards, and couldn't be used by C++ applications. Add the missing guards. Fixes: 7a3f27cbf59b ("ethdev: add access to specific device info") Fixes: dcd5c8112bc3 ("ethdev: add PCI driver helpers") Fixes: 7f0a669e7b04 ("ethdev: add allocation helper for virtual drivers") 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_ethdev/rte_dev_info.h | 8 ++++++++ lib/librte_ethdev/rte_ethdev_driver.h | 4 ++++ lib/librte_ethdev/rte_ethdev_pci.h | 8 ++++++++ lib/librte_ethdev/rte_ethdev_vdev.h | 8 ++++++++ 4 files changed, 28 insertions(+) diff --git a/lib/librte_ethdev/rte_dev_info.h b/lib/librte_ethdev/rte_dev_info.h index 7a6b61fdb7..cacb989ced 100644 --- a/lib/librte_ethdev/rte_dev_info.h +++ b/lib/librte_ethdev/rte_dev_info.h @@ -5,6 +5,10 @@ #ifndef _RTE_DEV_INFO_H_ #define _RTE_DEV_INFO_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include /* @@ -48,4 +52,8 @@ struct rte_eth_dev_module_info { #define RTE_ETH_MODULE_SFF_8436_LEN 256 #define RTE_ETH_MODULE_SFF_8436_MAX_LEN 640 +#ifdef __cplusplus +} +#endif + #endif /* _RTE_DEV_INFO_H_ */ diff --git a/lib/librte_ethdev/rte_ethdev_driver.h b/lib/librte_ethdev/rte_ethdev_driver.h index b6abef7782..afee4b8b80 100644 --- a/lib/librte_ethdev/rte_ethdev_driver.h +++ b/lib/librte_ethdev/rte_ethdev_driver.h @@ -5,6 +5,10 @@ #ifndef _RTE_ETHDEV_DRIVER_H_ #define _RTE_ETHDEV_DRIVER_H_ +#ifdef __cplusplus +extern "C" { +#endif + /** * @file * diff --git a/lib/librte_ethdev/rte_ethdev_pci.h b/lib/librte_ethdev/rte_ethdev_pci.h index 0eba781917..e2c83fd941 100644 --- a/lib/librte_ethdev/rte_ethdev_pci.h +++ b/lib/librte_ethdev/rte_ethdev_pci.h @@ -6,6 +6,10 @@ #ifndef _RTE_ETHDEV_PCI_H_ #define _RTE_ETHDEV_PCI_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include #include #include @@ -171,4 +175,8 @@ rte_eth_dev_pci_generic_remove(struct rte_pci_device *pci_dev, return 0; } +#ifdef __cplusplus +} +#endif + #endif /* _RTE_ETHDEV_PCI_H_ */ diff --git a/lib/librte_ethdev/rte_ethdev_vdev.h b/lib/librte_ethdev/rte_ethdev_vdev.h index 4ba3f28964..96a710d96a 100644 --- a/lib/librte_ethdev/rte_ethdev_vdev.h +++ b/lib/librte_ethdev/rte_ethdev_vdev.h @@ -6,6 +6,10 @@ #ifndef _RTE_ETHDEV_VDEV_H_ #define _RTE_ETHDEV_VDEV_H_ +#ifdef __cplusplus +extern "C" { +#endif + #include #include #include @@ -52,4 +56,8 @@ rte_eth_vdev_allocate(struct rte_vdev_device *dev, size_t private_data_size) return eth_dev; } +#ifdef __cplusplus +} +#endif + #endif /* _RTE_ETHDEV_VDEV_H_ */ -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-28 21:17:54.334585949 +0000 +++ 0004-ethdev-add-missing-C-guards.patch 2022-02-28 21:17:53.796928266 +0000 @@ -1 +1 @@ -From dbf9fc1dac70b64dd1ed9a3ffd6997838fbf170e Mon Sep 17 00:00:00 2001 +From c840104e2394624680b36d9498367f2138ca1828 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit dbf9fc1dac70b64dd1ed9a3ffd6997838fbf170e ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -19,5 +20,5 @@ - lib/ethdev/ethdev_driver.h | 8 ++++++++ - lib/ethdev/ethdev_pci.h | 8 ++++++++ - lib/ethdev/ethdev_vdev.h | 8 ++++++++ - lib/ethdev/rte_dev_info.h | 8 ++++++++ - 4 files changed, 32 insertions(+) + lib/librte_ethdev/rte_dev_info.h | 8 ++++++++ + lib/librte_ethdev/rte_ethdev_driver.h | 4 ++++ + lib/librte_ethdev/rte_ethdev_pci.h | 8 ++++++++ + lib/librte_ethdev/rte_ethdev_vdev.h | 8 ++++++++ + 4 files changed, 28 insertions(+) @@ -25,4 +26,4 @@ -diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h -index 6d697a879a..5ec00e533e 100644 ---- a/lib/ethdev/ethdev_driver.h -+++ b/lib/ethdev/ethdev_driver.h +diff --git a/lib/librte_ethdev/rte_dev_info.h b/lib/librte_ethdev/rte_dev_info.h +index 7a6b61fdb7..cacb989ced 100644 +--- a/lib/librte_ethdev/rte_dev_info.h ++++ b/lib/librte_ethdev/rte_dev_info.h @@ -30,2 +31,2 @@ - #ifndef _RTE_ETHDEV_DRIVER_H_ - #define _RTE_ETHDEV_DRIVER_H_ + #ifndef _RTE_DEV_INFO_H_ + #define _RTE_DEV_INFO_H_ @@ -37,6 +38,6 @@ - /** - * @file - * -@@ -1881,4 +1885,8 @@ struct rte_eth_tunnel_filter_conf { - uint16_t queue_id; /**< Queue assigned to if match */ - }; + #include + + /* +@@ -48,4 +52,8 @@ struct rte_eth_dev_module_info { + #define RTE_ETH_MODULE_SFF_8436_LEN 256 + #define RTE_ETH_MODULE_SFF_8436_MAX_LEN 640 @@ -48,5 +49,20 @@ - #endif /* _RTE_ETHDEV_DRIVER_H_ */ -diff --git a/lib/ethdev/ethdev_pci.h b/lib/ethdev/ethdev_pci.h -index 71aa4b2e98..6130bcbd1f 100644 ---- a/lib/ethdev/ethdev_pci.h -+++ b/lib/ethdev/ethdev_pci.h + #endif /* _RTE_DEV_INFO_H_ */ +diff --git a/lib/librte_ethdev/rte_ethdev_driver.h b/lib/librte_ethdev/rte_ethdev_driver.h +index b6abef7782..afee4b8b80 100644 +--- a/lib/librte_ethdev/rte_ethdev_driver.h ++++ b/lib/librte_ethdev/rte_ethdev_driver.h +@@ -5,6 +5,10 @@ + #ifndef _RTE_ETHDEV_DRIVER_H_ + #define _RTE_ETHDEV_DRIVER_H_ + ++#ifdef __cplusplus ++extern "C" { ++#endif ++ + /** + * @file + * +diff --git a/lib/librte_ethdev/rte_ethdev_pci.h b/lib/librte_ethdev/rte_ethdev_pci.h +index 0eba781917..e2c83fd941 100644 +--- a/lib/librte_ethdev/rte_ethdev_pci.h ++++ b/lib/librte_ethdev/rte_ethdev_pci.h @@ -73,4 +89,4 @@ -diff --git a/lib/ethdev/ethdev_vdev.h b/lib/ethdev/ethdev_vdev.h -index 2b49e9665b..f5f536ce64 100644 ---- a/lib/ethdev/ethdev_vdev.h -+++ b/lib/ethdev/ethdev_vdev.h +diff --git a/lib/librte_ethdev/rte_ethdev_vdev.h b/lib/librte_ethdev/rte_ethdev_vdev.h +index 4ba3f28964..96a710d96a 100644 +--- a/lib/librte_ethdev/rte_ethdev_vdev.h ++++ b/lib/librte_ethdev/rte_ethdev_vdev.h @@ -97,24 +112,0 @@ -diff --git a/lib/ethdev/rte_dev_info.h b/lib/ethdev/rte_dev_info.h -index cb2fe0ae97..67cf0ae526 100644 ---- a/lib/ethdev/rte_dev_info.h -+++ b/lib/ethdev/rte_dev_info.h -@@ -5,6 +5,10 @@ - #ifndef _RTE_DEV_INFO_H_ - #define _RTE_DEV_INFO_H_ - -+#ifdef __cplusplus -+extern "C" { -+#endif -+ - #include - - /* -@@ -48,4 +52,8 @@ struct rte_eth_dev_module_info { - #define RTE_ETH_MODULE_SFF_8436_LEN 256 - #define RTE_ETH_MODULE_SFF_8436_MAX_LEN 640 - -+#ifdef __cplusplus -+} -+#endif -+ - #endif /* _RTE_DEV_INFO_H_ */