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 AB55845E6F; Wed, 11 Dec 2024 03:07:13 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EA23E4067A; Wed, 11 Dec 2024 03:06:29 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id CC59940615 for ; Wed, 11 Dec 2024 03:06:16 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1213) id 4687320ACD6D; Tue, 10 Dec 2024 18:06:16 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 4687320ACD6D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1733882776; bh=EUta7k8RQ6URjhNjcpp4ikIhgKLOoz67FdtbhndVMI0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q0kv75Baz1eLyhtxc/9PJLl5GeHVY4Pan+MXFuu+CcvykvWD1ZiTkZl7urzmXS7Yk 8JWC9Ulz4sFYGB+dxiE3lhJnals2Q8Kvmb0KA2rhzirpq6BAQwrZYHyiC+KhIbQM48 tMauoSglJeAvXArOCZXS+zzU3xy2ynObtKlh6F60= From: Andre Muezerie To: Hemant Agrawal , Sachin Saxena Cc: dev@dpdk.org, Andre Muezerie Subject: [PATCH 12/21] drivers/mempool: use portable variadic macros Date: Tue, 10 Dec 2024 18:05:42 -0800 Message-Id: <1733882751-29598-13-git-send-email-andremue@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1733882751-29598-1-git-send-email-andremue@linux.microsoft.com> References: <1733882751-29598-1-git-send-email-andremue@linux.microsoft.com> 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 Many places are using a GCC extension related to variadic macros, where a name prepends the ellipsis. This results in a warning like the one below when compiling the code with MSVC: app\test-pmd\testpmd.h(1314): error C2608: invalid token '...' in macro parameter list Variadic macros became a standard part of the C language with C99. GCC, Clang and MSVC handle them properly. The fix is to remove the prefix name (args... becomes ...) and use __VA_ARGS__. Signed-off-by: Andre Muezerie --- drivers/mempool/dpaa/dpaa_mempool.h | 20 ++++++------- drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h | 30 +++++++++---------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/drivers/mempool/dpaa/dpaa_mempool.h b/drivers/mempool/dpaa/dpaa_mempool.h index 135520922f..0877068fdd 100644 --- a/drivers/mempool/dpaa/dpaa_mempool.h +++ b/drivers/mempool/dpaa/dpaa_mempool.h @@ -65,15 +65,15 @@ extern struct dpaa_bp_info *rte_dpaa_bpid_info; #define MEMPOOL_INIT_FUNC_TRACE() DPAA_MEMPOOL_LOG(DEBUG, " >>") -#define DPAA_MEMPOOL_DPDEBUG(fmt, args...) \ - RTE_LOG_DP(DEBUG, DPAA_MEMPOOL, fmt, ## args) -#define DPAA_MEMPOOL_DEBUG(fmt, args...) \ - DPAA_MEMPOOL_LOG(DEBUG, fmt, ## args) -#define DPAA_MEMPOOL_ERR(fmt, args...) \ - DPAA_MEMPOOL_LOG(ERR, fmt, ## args) -#define DPAA_MEMPOOL_INFO(fmt, args...) \ - DPAA_MEMPOOL_LOG(INFO, fmt, ## args) -#define DPAA_MEMPOOL_WARN(fmt, args...) \ - DPAA_MEMPOOL_LOG(WARNING, fmt, ## args) +#define DPAA_MEMPOOL_DPDEBUG(fmt, ...) \ + RTE_LOG_DP(DEBUG, DPAA_MEMPOOL, fmt, ## __VA_ARGS__) +#define DPAA_MEMPOOL_DEBUG(fmt, ...) \ + DPAA_MEMPOOL_LOG(DEBUG, fmt, ## __VA_ARGS__) +#define DPAA_MEMPOOL_ERR(fmt, ...) \ + DPAA_MEMPOOL_LOG(ERR, fmt, ## __VA_ARGS__) +#define DPAA_MEMPOOL_INFO(fmt, ...) \ + DPAA_MEMPOOL_LOG(INFO, fmt, ## __VA_ARGS__) +#define DPAA_MEMPOOL_WARN(fmt, ...) \ + DPAA_MEMPOOL_LOG(WARNING, fmt, ## __VA_ARGS__) #endif diff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h b/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h index d69ef17a04..1ba7983206 100644 --- a/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h +++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool_logs.h @@ -15,22 +15,22 @@ extern int dpaa2_logtype_mempool; #define DPAA2_MEMPOOL_DEBUG(...) \ RTE_LOG_LINE_PREFIX(DEBUG, DPAA2_MEMPOOL, "%s(): ", __func__, __VA_ARGS__) -#define DPAA2_MEMPOOL_INFO(fmt, args...) \ - DPAA2_MEMPOOL_LOG(INFO, fmt, ## args) -#define DPAA2_MEMPOOL_ERR(fmt, args...) \ - DPAA2_MEMPOOL_LOG(ERR, fmt, ## args) -#define DPAA2_MEMPOOL_WARN(fmt, args...) \ - DPAA2_MEMPOOL_LOG(WARNING, fmt, ## args) +#define DPAA2_MEMPOOL_INFO(fmt, ...) \ + DPAA2_MEMPOOL_LOG(INFO, fmt, ## __VA_ARGS__) +#define DPAA2_MEMPOOL_ERR(fmt, ...) \ + DPAA2_MEMPOOL_LOG(ERR, fmt, ## __VA_ARGS__) +#define DPAA2_MEMPOOL_WARN(fmt, ...) \ + DPAA2_MEMPOOL_LOG(WARNING, fmt, ## __VA_ARGS__) /* DP Logs, toggled out at compile time if level lower than current level */ -#define DPAA2_MEMPOOL_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, DPAA2_MEMPOOL, fmt, ## args) - -#define DPAA2_MEMPOOL_DP_DEBUG(fmt, args...) \ - DPAA2_MEMPOOL_DP_LOG(DEBUG, fmt, ## args) -#define DPAA2_MEMPOOL_DP_INFO(fmt, args...) \ - DPAA2_MEMPOOL_DP_LOG(INFO, fmt, ## args) -#define DPAA2_MEMPOOL_DP_WARN(fmt, args...) \ - DPAA2_MEMPOOL_DP_LOG(WARNING, fmt, ## args) +#define DPAA2_MEMPOOL_DP_LOG(level, fmt, ...) \ + RTE_LOG_DP(level, DPAA2_MEMPOOL, fmt, ## __VA_ARGS__) + +#define DPAA2_MEMPOOL_DP_DEBUG(fmt, ...) \ + DPAA2_MEMPOOL_DP_LOG(DEBUG, fmt, ## __VA_ARGS__) +#define DPAA2_MEMPOOL_DP_INFO(fmt, ...) \ + DPAA2_MEMPOOL_DP_LOG(INFO, fmt, ## __VA_ARGS__) +#define DPAA2_MEMPOOL_DP_WARN(fmt, ...) \ + DPAA2_MEMPOOL_DP_LOG(WARNING, fmt, ## __VA_ARGS__) #endif /* _DPAA2_HW_MEMPOOL_LOGS_H_ */ -- 2.47.0.vfs.0.3