From patchwork Wed Dec 19 16:28:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Lakkireddy X-Patchwork-Id: 49133 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7711F1B99B; Wed, 19 Dec 2018 17:30:25 +0100 (CET) Received: from stargate.chelsio.com (stargate.chelsio.com [12.32.117.8]) by dpdk.org (Postfix) with ESMTP id A99571B964 for ; Wed, 19 Dec 2018 17:30:23 +0100 (CET) Received: from localhost (scalar.blr.asicdesigners.com [10.193.185.94]) by stargate.chelsio.com (8.13.8/8.13.8) with ESMTP id wBJGUKaL024429; Wed, 19 Dec 2018 08:30:21 -0800 From: Rahul Lakkireddy To: dev@dpdk.org Cc: satishr@chelsio.com, indranil@chelsio.com Date: Wed, 19 Dec 2018 21:58:24 +0530 Message-Id: X-Mailer: git-send-email 2.5.3 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2 2/4] net/cxgbe: fix macros related to logs for Windows X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Replace "args..." with "fmt, ..." and directly use __VA_ARGS__. This fixes following errors reported by Intel C++ compiler in Windows build. C:\> cxgbe_compat.h(28): error : expected a ")" #define dev_printf(level, fmt, args...) \ ^ C:\> cxgbe_compat.h(31): error : expected a ")" #define dev_err(x, args...) dev_printf(ERR, args) ^ [...] Build Environment: 1. Target OS: Microsoft Windows Server 2016 2. Compiler: Intel C++ Compiler from Intel Parallel Studio XE 2019 [1] 3. Development Tools: 3.1 Microsoft Visual Studio 2017 Professional 3.2 Windows Software Development Kit (SDK) v10.0.17763 3.3 Windows Driver Kit (WDK) v10.0.17763 [1] https://software.intel.com/en-us/parallel-studio-xe Signed-off-by: Rahul Lakkireddy --- v2: - Add more info in commit message regarding Windows build. drivers/net/cxgbe/cxgbe_compat.h | 40 ++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/drivers/net/cxgbe/cxgbe_compat.h b/drivers/net/cxgbe/cxgbe_compat.h index 5d47c5f3d..ce4662d54 100644 --- a/drivers/net/cxgbe/cxgbe_compat.h +++ b/drivers/net/cxgbe/cxgbe_compat.h @@ -19,41 +19,45 @@ #include #include -#define dev_printf(level, fmt, args...) \ - RTE_LOG(level, PMD, "rte_cxgbe_pmd: " fmt, ## args) +#define dev_printf(level, fmt, ...) \ + RTE_LOG(level, PMD, "rte_cxgbe_pmd: " fmt, ##__VA_ARGS__) -#define dev_err(x, args...) dev_printf(ERR, args) -#define dev_info(x, args...) dev_printf(INFO, args) -#define dev_warn(x, args...) dev_printf(WARNING, args) +#define dev_err(x, fmt, ...) dev_printf(ERR, fmt, ##__VA_ARGS__) +#define dev_info(x, fmt, ...) dev_printf(INFO, fmt, ##__VA_ARGS__) +#define dev_warn(x, fmt, ...) dev_printf(WARNING, fmt, ##__VA_ARGS__) #ifdef RTE_LIBRTE_CXGBE_DEBUG -#define dev_debug(x, args...) dev_printf(DEBUG, args) +#define dev_debug(x, fmt, ...) dev_printf(INFO, fmt, ##__VA_ARGS__) #else -#define dev_debug(x, args...) do { } while (0) +#define dev_debug(x, fmt, ...) do { } while (0) #endif #ifdef RTE_LIBRTE_CXGBE_DEBUG_REG -#define CXGBE_DEBUG_REG(x, args...) dev_printf(DEBUG, "REG:" args) +#define CXGBE_DEBUG_REG(x, fmt, ...) \ + dev_printf(INFO, "REG:" fmt, ##__VA_ARGS__) #else -#define CXGBE_DEBUG_REG(x, args...) do { } while (0) +#define CXGBE_DEBUG_REG(x, fmt, ...) do { } while (0) #endif #ifdef RTE_LIBRTE_CXGBE_DEBUG_MBOX -#define CXGBE_DEBUG_MBOX(x, args...) dev_printf(DEBUG, "MBOX:" args) +#define CXGBE_DEBUG_MBOX(x, fmt, ...) \ + dev_printf(INFO, "MBOX:" fmt, ##__VA_ARGS__) #else -#define CXGBE_DEBUG_MBOX(x, args...) do { } while (0) +#define CXGBE_DEBUG_MBOX(x, fmt, ...) do { } while (0) #endif #ifdef RTE_LIBRTE_CXGBE_DEBUG_TX -#define CXGBE_DEBUG_TX(x, args...) dev_printf(DEBUG, "TX:" args) +#define CXGBE_DEBUG_TX(x, fmt, ...) \ + dev_printf(INFO, "TX:" fmt, ##__VA_ARGS__) #else -#define CXGBE_DEBUG_TX(x, args...) do { } while (0) +#define CXGBE_DEBUG_TX(x, fmt, ...) do { } while (0) #endif #ifdef RTE_LIBRTE_CXGBE_DEBUG_RX -#define CXGBE_DEBUG_RX(x, args...) dev_printf(DEBUG, "RX:" args) +#define CXGBE_DEBUG_RX(x, fmt, ...) \ + dev_printf(INFO, "RX:" fmt, ##__VA_ARGS__) #else -#define CXGBE_DEBUG_RX(x, args...) do { } while (0) +#define CXGBE_DEBUG_RX(x, fmt, ...) do { } while (0) #endif #ifdef RTE_LIBRTE_CXGBE_DEBUG @@ -63,9 +67,9 @@ #define CXGBE_FUNC_TRACE() do { } while (0) #endif -#define pr_err(y, args...) dev_err(0, y, ##args) -#define pr_warn(y, args...) dev_warn(0, y, ##args) -#define pr_info(y, args...) dev_info(0, y, ##args) +#define pr_err(fmt, ...) dev_err(0, fmt, ##__VA_ARGS__) +#define pr_warn(fmt, ...) dev_warn(0, fmt, ##__VA_ARGS__) +#define pr_info(fmt, ...) dev_info(0, fmt, ##__VA_ARGS__) #define BUG() pr_err("BUG at %s:%d", __func__, __LINE__) #define ASSERT(x) do {\