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 20A23A0350; Fri, 4 Feb 2022 18:42:56 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5880A40E28; Fri, 4 Feb 2022 18:42:53 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mails.dpdk.org (Postfix) with ESMTP id 5FBF9410D5 for ; Fri, 4 Feb 2022 18:42:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643996572; x=1675532572; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WDVlg225rtoKKy0IqVnNCWKSBfLLDWdoS03V0aStnGA=; b=JAnXukclFi9Di+wQyx2rGdwBpPJQwi/JGaKvU23bHtOSavEpSkJi8w5R gQ0D/+tXavnooXjlhDIZP2hDvJJhagZ9ehXsCJifYs2BkGzodoc1L+AVV 9mc/vJDpJVq1If5u6e0RgCF5RS4bTXu4guhbNlyXQHGd1/5I76njnTsRd OqiSb7l8Z7ZBeM82hJrpjIYKhKN9MSSCRwoGRWkbMV4RZkIb1xgxfic6j W7Iy6kcQ3FD7rFB3PggMRsLWjynkHFieT3F247JGRWShss0whgGG+8WZL 4+i8Br9PCtnV6YO4sZIL8kXaKLGGbMcrlIP5VYnKVEkXNzZmBXO9Cd0Il w==; X-IronPort-AV: E=McAfee;i="6200,9189,10248"; a="229060640" X-IronPort-AV: E=Sophos;i="5.88,343,1635231600"; d="scan'208";a="229060640" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Feb 2022 09:42:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,343,1635231600"; d="scan'208";a="620890463" Received: from silpixa00399126.ir.intel.com ([10.237.223.162]) by FMSMGA003.fm.intel.com with ESMTP; 04 Feb 2022 09:42:50 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Maxime Coquelin , Chenbo Xia , Xiao Wang , Matan Azrad , Viacheslav Ovsiienko Subject: [PATCH 6/7] vhost: remove non-C++ compatible includes Date: Fri, 4 Feb 2022 17:42:08 +0000 Message-Id: <20220204174209.440207-7-bruce.richardson@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220204174209.440207-1-bruce.richardson@intel.com> References: <20220204174209.440207-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Some of the linux header includes are explicitly noted as being incompatible with C++. However, these headers can included by C files directly, or by internal headers, to avoid polluting the public DPDK headers with non-C++ safe includes. Signed-off-by: Bruce Richardson --- drivers/net/vhost/rte_eth_vhost.c | 2 ++ drivers/vdpa/ifc/ifcvf_vdpa.c | 2 ++ drivers/vdpa/mlx5/mlx5_vdpa.h | 1 + lib/vhost/rte_vhost.h | 4 ---- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index 070f0e6dfd..cd2afe3100 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -16,6 +16,8 @@ #include #include #include +#include +#include #include "rte_eth_vhost.h" diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c index 3853c4cf7e..cbd190ea8d 100644 --- a/drivers/vdpa/ifc/ifcvf_vdpa.c +++ b/drivers/vdpa/ifc/ifcvf_vdpa.c @@ -24,6 +24,8 @@ #include #include +#include + #include "base/ifcvf.h" RTE_LOG_REGISTER(ifcvf_vdpa_logtype, pmd.vdpa.ifcvf, NOTICE); diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.h b/drivers/vdpa/mlx5/mlx5_vdpa.h index 22617924ea..a7fa4356dd 100644 --- a/drivers/vdpa/mlx5/mlx5_vdpa.h +++ b/drivers/vdpa/mlx5/mlx5_vdpa.h @@ -6,6 +6,7 @@ #define RTE_PMD_MLX5_VDPA_H_ #include +#include #include #ifdef PEDANTIC diff --git a/lib/vhost/rte_vhost.h b/lib/vhost/rte_vhost.h index b454c05868..0a21177199 100644 --- a/lib/vhost/rte_vhost.h +++ b/lib/vhost/rte_vhost.h @@ -21,10 +21,6 @@ extern "C" { #endif -/* These are not C++-aware. */ -#include -#include -#include #define RTE_VHOST_USER_CLIENT (1ULL << 0) #define RTE_VHOST_USER_NO_RECONNECT (1ULL << 1) -- 2.32.0