From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from stargate.chelsio.com (stargate.chelsio.com [12.32.117.8]) by dpdk.org (Postfix) with ESMTP id 28DCF201 for ; Sun, 10 Mar 2019 11:16:22 +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 x2AAGKbt008712; Sun, 10 Mar 2019 03:16:21 -0700 Date: Sun, 10 Mar 2019 15:43:06 +0530 From: Rahul Lakkireddy To: Yongseok Koh Cc: dpdk stable Message-ID: <20190310101303.GA1197@chelsio.com> References: <20190308180901.31938-1-yskoh@mellanox.com> <20190308180901.31938-2-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190308180901.31938-2-yskoh@mellanox.com> User-Agent: Mutt/1.5.24 (2015-08-30) Subject: Re: [dpdk-stable] please check if patch 'net/cxgbe: fix macros related to logs for Windows' is applicable to LTS release 17.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Mar 2019 10:16:23 -0000 On Friday, March 03/08/19, 2019 at 23:39:00 +0530, Yongseok Koh wrote: > Hi, > > Even though the patch doesn't have "Cc: stable@dpdk.org" tag or "Fixes:" tag, > the commit log says it fixes some issue. Tags might be mistakenly missed. We > don't want to miss any fixes for stable releases. That's why I'm sending this > email. > > Please send backports if you think the patch should be merged to LTS release 17.11.6 > Or, let me know if you have any comments, say, need more time, or it's worthless > to backport it. And please send it to "stable@dpdk.org", but not "dev@dpdk.org". > > FYI, branch 17.11 is located at tree: > git://dpdk.org/dpdk-stable > > It'd be great if you could do that in one or two weeks. Also, please add a > heading line like below before the commit log body: > [ backported from upstream commit xxx ] > > Example: http://dpdk.org/browse/dpdk-stable/commit/?h=16.07&id=c4831394c7d1944d8ec27d52c22997f20d19718e > > Also please mention the target LTS in the subject line, as we have > more than one at the same time, for example: > > [PATCH 17.11] foo/bar: fix baz > > With git send-email, this can be achieved by appending the parameter: > > --subject-prefix='17.11' > > > Thanks. > > Yongseok > Don't backport this patch. It fixes compilation errors reported by Intel C++ Compiler for the upcoming DPDK Windows OS support, and hence is unnecessary to backport to older stable releases that don't have DPDK Windows OS support. Thanks, Rahul > --- > From b5c3a5fd577af3b91c99b0ab88748e04ff96e363 Mon Sep 17 00:00:00 2001 > From: Rahul Lakkireddy > Date: Wed, 19 Dec 2018 21:58:24 +0530 > Subject: [PATCH] net/cxgbe: fix macros related to logs for Windows > > 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 > --- > 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 {\ > -- > 2.11.0 >