diff mbox series

[15/15] vhost: use GCC and MSVC common VA ARGS extension

Message ID	1707774557-16012-16-git-send-email-roretzla@linux.microsoft.com (mailing list archive)
State	Superseded, archived
Delegated to:	Thomas Monjalon
Headers	From: Tyler Retzlaff <roretzla@linux.microsoft.com> To: dev@dpdk.org Cc: Anatoly Burakov <anatoly.burakov@intel.com>, Ashish Gupta <ashish.gupta@marvell.com>, Chenbo Xia <chenbox@nvidia.com>, Cristian Dumitrescu <cristian.dumitrescu@intel.com>, David Hunt <david.hunt@intel.com>, Fan Zhang <fanzhang.oss@gmail.com>, Hemant Agrawal <hemant.agrawal@nxp.com>, Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>, Jasvinder Singh <jasvinder.singh@intel.com>, Jerin Jacob <jerinj@marvell.com>, Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>, Maxime Coquelin <maxime.coquelin@redhat.com>, Reshma Pattan <reshma.pattan@intel.com>, Sachin Saxena <sachin.saxena@nxp.com>, Sivaprasad Tummala <sivaprasad.tummala@amd.com>, Srikanth Yalavarthi <syalavarthi@marvell.com>, Stephen Hemminger <stephen@networkplumber.org>, Sunil Kumar Kori <skori@marvell.com>, Tyler Retzlaff <roretzla@linux.microsoft.com> Subject: [PATCH 15/15] vhost: use GCC and MSVC common VA ARGS extension Date: Mon, 12 Feb 2024 13:49:17 -0800 Message-Id: <1707774557-16012-16-git-send-email-roretzla@linux.microsoft.com> In-Reply-To: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> References: <1707774557-16012-1-git-send-email-roretzla@linux.microsoft.com> Precedence: list Errors-To: dev-bounces@dpdk.org
Series	use GCC/MSVC compatible __VA_ARGS__ \| [00/15] use GCC/MSVC compatible __VA_ARGS__ [01/15] eal: use GCC and MSVC common VA ARGS extension [02/15] bpf: use GCC and MSVC common VA ARGS extension [03/15] cfgfile: use GCC and MSVC common VA ARGS extension [04/15] cmdline: use GCC and MSVC common VA ARGS extension [05/15] ip_frag: use GCC and MSVC common VA ARGS extension [06/15] compressdev: use GCC and MSVC common VA ARGS extension [07/15] metrics: use GCC and MSVC common VA ARGS extension [08/15] mldev: use GCC and MSVC common VA ARGS extension [09/15] net: use GCC and MSVC common VA ARGS extension [10/15] pdump: use GCC and MSVC common VA ARGS extension [11/15] power: use GCC and MSVC common VA ARGS extension [12/15] rawdev: use GCC and MSVC common VA ARGS extension [13/15] rcu: use GCC and MSVC common VA ARGS extension [14/15] stack: use GCC and MSVC common VA ARGS extension [15/15] vhost: use GCC and MSVC common VA ARGS extension

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK
ci/loongarch-compilation	success	Compilation OK
ci/loongarch-unit-testing	success	Unit Testing PASS
ci/Intel-compilation	success	Compilation OK
ci/intel-Testing	success	Testing PASS
ci/intel-Functional	success	Functional PASS
ci/github-robot: build	success	github build: passed
ci/iol-intel-Performance	success	Performance Testing PASS
ci/iol-intel-Functional	success	Functional Testing PASS
ci/iol-abi-testing	success	Testing PASS
ci/iol-compile-amd64-testing	success	Testing PASS
ci/iol-unit-amd64-testing	success	Testing PASS
ci/iol-broadcom-Performance	success	Performance Testing PASS
ci/iol-unit-arm64-testing	success	Testing PASS
ci/iol-broadcom-Functional	success	Functional Testing PASS
ci/iol-compile-arm64-testing	success	Testing PASS
ci/iol-mellanox-Performance	success	Performance Testing PASS
ci/iol-sample-apps-testing	success	Testing PASS

Commit Message

Tyler Retzlaff Feb. 12, 2024, 9:49 p.m. UTC

  Use ... and forward with __VA_ARGS__ instead of args... and args.
Neither mechanism is conformant with the standard but the former works
with both GCC and MSVC.

Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
 lib/vhost/vhost.h        |  8 ++++----
 lib/vhost/vhost_crypto.c | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff mbox series

Patch

diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h
index 0b13374..b539d6c 100644
--- a/lib/vhost/vhost.h
+++ b/lib/vhost/vhost.h
@@ -677,11 +677,11 @@  void __vhost_log_write_iova(struct virtio_net *dev, struct vhost_virtqueue *vq,
 extern int vhost_data_log_level;
 #define RTE_LOGTYPE_VHOST_DATA vhost_data_log_level
 
-#define VHOST_CONFIG_LOG(prefix, level, fmt, args...)		\
-	RTE_LOG_LINE(level, VHOST_CONFIG, "(%s) " fmt, prefix, ##args)
+#define VHOST_CONFIG_LOG(prefix, level, fmt, ...)		\
+	RTE_LOG_LINE(level, VHOST_CONFIG, "(%s) " fmt, prefix, ## __VA_ARGS__)
 
-#define VHOST_DATA_LOG(prefix, level, fmt, args...)		\
-	RTE_LOG_DP_LINE(level, VHOST_DATA, "(%s) " fmt, prefix, ##args)
+#define VHOST_DATA_LOG(prefix, level, fmt, ...)		\
+	RTE_LOG_DP_LINE(level, VHOST_DATA, "(%s) " fmt, prefix, ## __VA_ARGS__)
 
 #ifdef RTE_LIBRTE_VHOST_DEBUG
 #define VHOST_MAX_PRINT_BUFF 6072
diff --git a/lib/vhost/vhost_crypto.c b/lib/vhost/vhost_crypto.c
index 3704fbb..86983c1 100644
--- a/lib/vhost/vhost_crypto.c
+++ b/lib/vhost/vhost_crypto.c
@@ -20,19 +20,19 @@ 
 RTE_LOG_REGISTER_SUFFIX(vhost_crypto_logtype, crypto, INFO);
 #define RTE_LOGTYPE_VHOST_CRYPTO	vhost_crypto_logtype
 
-#define VC_LOG_ERR(fmt, args...)				\
+#define VC_LOG_ERR(fmt, ...)				\
 	RTE_LOG_LINE(ERR, VHOST_CRYPTO, "%s() line %u: " fmt,	\
-		__func__, __LINE__, ## args)
-#define VC_LOG_INFO(fmt, args...)				\
+		__func__, __LINE__, ## __VA_ARGS__)
+#define VC_LOG_INFO(fmt, ...)				\
 	RTE_LOG_LINE(INFO, VHOST_CRYPTO, "%s() line %u: " fmt,	\
-		__func__, __LINE__, ## args)
+		__func__, __LINE__, ## __VA_ARGS__)
 
 #ifdef RTE_LIBRTE_VHOST_DEBUG
-#define VC_LOG_DBG(fmt, args...)				\
+#define VC_LOG_DBG(fmt, ...)				\
 	RTE_LOG_LINE(DEBUG, VHOST_CRYPTO, "%s() line %u: " fmt,	\
-		__func__, __LINE__, ## args)
+		__func__, __LINE__, ## __VA_ARGS__)
 #else
-#define VC_LOG_DBG(fmt, args...)
+#define VC_LOG_DBG(fmt, ...)
 #endif
 
 #define VIRTIO_CRYPTO_FEATURES ((1ULL << VIRTIO_F_NOTIFY_ON_EMPTY) |	\