dev.dpdk.org archive mirror
 help / color / mirror / Atom feed
From: Andre Muezerie <andremue@linux.microsoft.com>
To: Gagandeep Singh <g.singh@nxp.com>,
	Sachin Saxena <sachin.saxena@nxp.com>,
	Hemant Agrawal <hemant.agrawal@nxp.com>,
	Bruce Richardson <bruce.richardson@intel.com>,
	Kevin Laatz <kevin.laatz@intel.com>,
	Conor Walsh <conor.walsh@intel.com>
Cc: dev@dpdk.org, Andre Muezerie <andremue@linux.microsoft.com>
Subject: [PATCH 10/21] drivers/dma: use portable variadic macros
Date: Tue, 10 Dec 2024 18:05:40 -0800	[thread overview]
Message-ID: <1733882751-29598-11-git-send-email-andremue@linux.microsoft.com> (raw)
In-Reply-To: <1733882751-29598-1-git-send-email-andremue@linux.microsoft.com>

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 <andremue@linux.microsoft.com>
---
 drivers/dma/dpaa/dpaa_qdma_logs.h   | 24 ++++++++++++------------
 drivers/dma/dpaa2/dpaa2_qdma_logs.h | 24 ++++++++++++------------
 drivers/dma/idxd/idxd_internal.h    |  8 ++++----
 drivers/dma/ioat/ioat_internal.h    |  8 ++++----
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/drivers/dma/dpaa/dpaa_qdma_logs.h b/drivers/dma/dpaa/dpaa_qdma_logs.h
index 2d77255fd8..cbed89485f 100644
--- a/drivers/dma/dpaa/dpaa_qdma_logs.h
+++ b/drivers/dma/dpaa/dpaa_qdma_logs.h
@@ -16,22 +16,22 @@ extern int dpaa_qdma_logtype;
 
 #define DPAA_QDMA_FUNC_TRACE() DPAA_QDMA_DEBUG(">>")
 
-#define DPAA_QDMA_INFO(fmt, args...) \
-	DPAA_QDMA_LOG(INFO, fmt, ## args)
-#define DPAA_QDMA_ERR(fmt, args...) \
-	DPAA_QDMA_LOG(ERR, fmt, ## args)
-#define DPAA_QDMA_WARN(fmt, args...) \
-	DPAA_QDMA_LOG(WARNING, fmt, ## args)
+#define DPAA_QDMA_INFO(fmt, ...) \
+	DPAA_QDMA_LOG(INFO, fmt, ## __VA_ARGS__)
+#define DPAA_QDMA_ERR(fmt, ...) \
+	DPAA_QDMA_LOG(ERR, fmt, ## __VA_ARGS__)
+#define DPAA_QDMA_WARN(fmt, ...) \
+	DPAA_QDMA_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 /* DP Logs, toggled out at compile time if level lower than current level */
 #define DPAA_QDMA_DP_LOG(level, ...) \
 	RTE_LOG_DP_LINE(level, DPAA_QDMA, __VA_ARGS__)
 
-#define DPAA_QDMA_DP_DEBUG(fmt, args...) \
-	DPAA_QDMA_DP_LOG(DEBUG, fmt, ## args)
-#define DPAA_QDMA_DP_INFO(fmt, args...) \
-	DPAA_QDMA_DP_LOG(INFO, fmt, ## args)
-#define DPAA_QDMA_DP_WARN(fmt, args...) \
-	DPAA_QDMA_DP_LOG(WARNING, fmt, ## args)
+#define DPAA_QDMA_DP_DEBUG(fmt, ...) \
+	DPAA_QDMA_DP_LOG(DEBUG, fmt, ## __VA_ARGS__)
+#define DPAA_QDMA_DP_INFO(fmt, ...) \
+	DPAA_QDMA_DP_LOG(INFO, fmt, ## __VA_ARGS__)
+#define DPAA_QDMA_DP_WARN(fmt, ...) \
+	DPAA_QDMA_DP_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 #endif /* __DPAA_QDMA_LOGS_H__ */
diff --git a/drivers/dma/dpaa2/dpaa2_qdma_logs.h b/drivers/dma/dpaa2/dpaa2_qdma_logs.h
index 62ef60bcf2..50a865a56a 100644
--- a/drivers/dma/dpaa2/dpaa2_qdma_logs.h
+++ b/drivers/dma/dpaa2/dpaa2_qdma_logs.h
@@ -20,23 +20,23 @@ extern int dpaa2_qdma_logtype;
 
 #define DPAA2_QDMA_FUNC_TRACE() DPAA2_QDMA_DEBUG(">>")
 
-#define DPAA2_QDMA_INFO(fmt, args...) \
-	DPAA2_QDMA_LOG(INFO, fmt, ## args)
-#define DPAA2_QDMA_ERR(fmt, args...) \
-	DPAA2_QDMA_LOG(ERR, fmt, ## args)
-#define DPAA2_QDMA_WARN(fmt, args...) \
-	DPAA2_QDMA_LOG(WARNING, fmt, ## args)
+#define DPAA2_QDMA_INFO(fmt, ...) \
+	DPAA2_QDMA_LOG(INFO, fmt, ## __VA_ARGS__)
+#define DPAA2_QDMA_ERR(fmt, ...) \
+	DPAA2_QDMA_LOG(ERR, fmt, ## __VA_ARGS__)
+#define DPAA2_QDMA_WARN(fmt, ...) \
+	DPAA2_QDMA_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 /* DP Logs, toggled out at compile time if level lower than current level */
 #define DPAA2_QDMA_DP_LOG(level, ...) \
 	RTE_LOG_DP_LINE(level, DPAA2_QDMA, __VA_ARGS__)
 
-#define DPAA2_QDMA_DP_DEBUG(fmt, args...) \
-	DPAA2_QDMA_DP_LOG(DEBUG, fmt, ## args)
-#define DPAA2_QDMA_DP_INFO(fmt, args...) \
-	DPAA2_QDMA_DP_LOG(INFO, fmt, ## args)
-#define DPAA2_QDMA_DP_WARN(fmt, args...) \
-	DPAA2_QDMA_DP_LOG(WARNING, fmt, ## args)
+#define DPAA2_QDMA_DP_DEBUG(fmt, ...) \
+	DPAA2_QDMA_DP_LOG(DEBUG, fmt, ## __VA_ARGS__)
+#define DPAA2_QDMA_DP_INFO(fmt, ...) \
+	DPAA2_QDMA_DP_LOG(INFO, fmt, ## __VA_ARGS__)
+#define DPAA2_QDMA_DP_WARN(fmt, ...) \
+	DPAA2_QDMA_DP_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 #ifdef __cplusplus
 }
diff --git a/drivers/dma/idxd/idxd_internal.h b/drivers/dma/idxd/idxd_internal.h
index 99dc2b367e..b80a113455 100644
--- a/drivers/dma/idxd/idxd_internal.h
+++ b/drivers/dma/idxd/idxd_internal.h
@@ -25,10 +25,10 @@ extern int idxd_pmd_logtype;
 #define IDXD_PMD_LOG(level, ...) \
 	RTE_LOG_LINE_PREFIX(level, IDXD_PMD, "%s(): ", __func__, __VA_ARGS__)
 
-#define IDXD_PMD_DEBUG(fmt, args...)  IDXD_PMD_LOG(DEBUG, fmt, ## args)
-#define IDXD_PMD_INFO(fmt, args...)   IDXD_PMD_LOG(INFO, fmt, ## args)
-#define IDXD_PMD_ERR(fmt, args...)    IDXD_PMD_LOG(ERR, fmt, ## args)
-#define IDXD_PMD_WARN(fmt, args...)   IDXD_PMD_LOG(WARNING, fmt, ## args)
+#define IDXD_PMD_DEBUG(fmt, ...)  IDXD_PMD_LOG(DEBUG, fmt, ## __VA_ARGS__)
+#define IDXD_PMD_INFO(fmt, ...)   IDXD_PMD_LOG(INFO, fmt, ## __VA_ARGS__)
+#define IDXD_PMD_ERR(fmt, ...)    IDXD_PMD_LOG(ERR, fmt, ## __VA_ARGS__)
+#define IDXD_PMD_WARN(fmt, ...)   IDXD_PMD_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 struct idxd_pci_common {
 	rte_spinlock_t lk;
diff --git a/drivers/dma/ioat/ioat_internal.h b/drivers/dma/ioat/ioat_internal.h
index 2da26b616f..a5b25701a4 100644
--- a/drivers/dma/ioat/ioat_internal.h
+++ b/drivers/dma/ioat/ioat_internal.h
@@ -40,9 +40,9 @@ extern int ioat_pmd_logtype;
 #define IOAT_PMD_LOG(level, ...) \
 	RTE_LOG_LINE_PREFIX(level, IOAT_PMD, "%s(): ", __func__, __VA_ARGS__)
 
-#define IOAT_PMD_DEBUG(fmt, args...)  IOAT_PMD_LOG(DEBUG, fmt, ## args)
-#define IOAT_PMD_INFO(fmt, args...)   IOAT_PMD_LOG(INFO, fmt, ## args)
-#define IOAT_PMD_ERR(fmt, args...)    IOAT_PMD_LOG(ERR, fmt, ## args)
-#define IOAT_PMD_WARN(fmt, args...)   IOAT_PMD_LOG(WARNING, fmt, ## args)
+#define IOAT_PMD_DEBUG(fmt, ...)  IOAT_PMD_LOG(DEBUG, fmt, ## __VA_ARGS__)
+#define IOAT_PMD_INFO(fmt, ...)   IOAT_PMD_LOG(INFO, fmt, ## __VA_ARGS__)
+#define IOAT_PMD_ERR(fmt, ...)    IOAT_PMD_LOG(ERR, fmt, ## __VA_ARGS__)
+#define IOAT_PMD_WARN(fmt, ...)   IOAT_PMD_LOG(WARNING, fmt, ## __VA_ARGS__)
 
 #endif /* _IOAT_INTERNAL_H_ */
-- 
2.47.0.vfs.0.3


  parent reply	other threads:[~2024-12-11  2:07 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-11  2:05 [PATCH 00/21] use portable variadic macros Andre Muezerie
2024-12-11  2:05 ` [PATCH 01/21] app/test-acl: " Andre Muezerie
2024-12-11  2:05 ` [PATCH 02/21] app/test-eventdev: " Andre Muezerie
2024-12-11  2:05 ` [PATCH 03/21] app/test-mldev: " Andre Muezerie
2024-12-11  2:05 ` [PATCH 04/21] app/test-pmd: " Andre Muezerie
2024-12-11  2:05 ` [PATCH 05/21] drivers/baseband: ensure code structure does not change Andre Muezerie
2024-12-11  2:05 ` [PATCH 06/21] drivers/bus: use portable variadic macros Andre Muezerie
2024-12-11  2:05 ` [PATCH 07/21] drivers/common: " Andre Muezerie
2024-12-11  2:05 ` [PATCH 08/21] drivers/compress: " Andre Muezerie
2024-12-11  2:05 ` [PATCH 09/21] drivers/crypto: " Andre Muezerie
2024-12-11  2:05 ` Andre Muezerie [this message]
2024-12-11  2:05 ` [PATCH 11/21] drivers/event: " Andre Muezerie
2024-12-11  2:05 ` [PATCH 12/21] drivers/mempool: " Andre Muezerie
2024-12-11  2:05 ` [PATCH 13/21] drivers/net: " Andre Muezerie
2024-12-16  9:02   ` Andrew Rybchenko
2024-12-11  2:05 ` [PATCH 14/21] drivers/raw: " Andre Muezerie
2024-12-11  2:05 ` [PATCH 15/21] drivers/vdpa: " Andre Muezerie
2024-12-11  2:05 ` [PATCH 16/21] lib/log: ensure code structure does not change Andre Muezerie
2024-12-11  3:13   ` Stephen Hemminger
2024-12-11 16:16     ` Andre Muezerie
2024-12-11  2:05 ` [PATCH 17/21] lib/pipeline: " Andre Muezerie
2024-12-11  2:05 ` [PATCH 18/21] lib/port: " Andre Muezerie
2024-12-11  2:05 ` [PATCH 19/21] lib/power: " Andre Muezerie
2024-12-11  2:05 ` [PATCH 20/21] lib/rcu: " Andre Muezerie
2024-12-11  2:05 ` [PATCH 21/21] lib/vhost: " Andre Muezerie
2024-12-11  3:14 ` [PATCH 00/21] use portable variadic macros Stephen Hemminger
2024-12-11 21:35   ` Andre Muezerie
2024-12-11 22:07 ` [PATCH v2 00/14] " Andre Muezerie
2024-12-11 22:07   ` [PATCH v2 01/14] app/test-acl: " Andre Muezerie
2024-12-11 22:07   ` [PATCH v2 02/14] app/test-eventdev: " Andre Muezerie
2024-12-11 22:07   ` [PATCH v2 03/14] app/test-mldev: " Andre Muezerie
2024-12-11 22:07   ` [PATCH v2 04/14] app/test-pmd: " Andre Muezerie
2024-12-11 22:07   ` [PATCH v2 05/14] drivers/bus: " Andre Muezerie
2024-12-23  8:43     ` David Marchand
2024-12-11 22:07   ` [PATCH v2 06/14] drivers/common: " Andre Muezerie
2024-12-11 22:07   ` [PATCH v2 07/14] drivers/compress: " Andre Muezerie
2024-12-11 22:07   ` [PATCH v2 08/14] drivers/crypto: " Andre Muezerie
2024-12-11 22:07   ` [PATCH v2 09/14] drivers/dma: " Andre Muezerie
2024-12-11 22:07   ` [PATCH v2 10/14] drivers/event: " Andre Muezerie
2024-12-11 22:07   ` [PATCH v2 11/14] drivers/mempool: " Andre Muezerie
2024-12-11 22:07   ` [PATCH v2 12/14] drivers/net: " Andre Muezerie
2024-12-11 22:07   ` [PATCH v2 13/14] drivers/raw: " Andre Muezerie
2024-12-23  8:45     ` David Marchand
2024-12-11 22:07   ` [PATCH v2 14/14] drivers/vdpa: " Andre Muezerie
2024-12-23  9:28   ` [PATCH v2 00/14] " David Marchand
2024-12-23 15:39     ` Andre Muezerie

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1733882751-29598-11-git-send-email-andremue@linux.microsoft.com \
    --to=andremue@linux.microsoft.com \
    --cc=bruce.richardson@intel.com \
    --cc=conor.walsh@intel.com \
    --cc=dev@dpdk.org \
    --cc=g.singh@nxp.com \
    --cc=hemant.agrawal@nxp.com \
    --cc=kevin.laatz@intel.com \
    --cc=sachin.saxena@nxp.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).