[PATCH] ixgbe: fix build with bypass and debug enabled

[PATCH] ixgbe: fix build with bypass and debug enabled

[Thomas Monjalon]

Since commit aae1047905621 ("use the right debug macro"),
DEBUGOUT was replaced by PMD_DRV_LOG which requires at least
2 arguments. But the level argument was missing.

Commit 7a10de5e27 fixed the logs but not the macros FUNC_PTR_OR_*
which are not preprocessed if RTE_LIBRTE_IXGBE_DEBUG_DRIVER is disabled.

Signed-off-by: Thomas Monjalon <thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
---
 lib/librte_pmd_ixgbe/ixgbe_bypass.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/librte_pmd_ixgbe/ixgbe_bypass.c b/lib/librte_pmd_ixgbe/ixgbe_bypass.c
index 15203a4..832f415 100644
--- a/lib/librte_pmd_ixgbe/ixgbe_bypass.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_bypass.c
@@ -42,7 +42,7 @@
 /* Macros to check for invlaid function pointers. */
 #define	FUNC_PTR_OR_ERR_RET(func, retval) do {              \
 	if ((func) == NULL) {                               \
-		PMD_DRV_LOG("%s:%d function not supported", \
+		PMD_DRV_LOG(ERR, "%s:%d function not supported", \
 			    __func__, __LINE__);            \
 		return retval;                            \
 	}                                                   \
@@ -50,7 +50,7 @@
 
 #define	FUNC_PTR_OR_RET(func) do {                          \
 	if ((func) == NULL) {                               \
-		PMD_DRV_LOG("%s:%d function not supported", \
+		PMD_DRV_LOG(ERR, "%s:%d function not supported", \
 			    __func__, __LINE__);            \
 		return;                                     \
 	}                                                   \
-- 
2.1.3

Re: [PATCH] ixgbe: fix build with bypass and debug enabled

[David Marchand]

On Mon, Dec 1, 2014 at 6:40 PM, Thomas Monjalon <thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
wrote:

> Since commit aae1047905621 ("use the right debug macro"),
> DEBUGOUT was replaced by PMD_DRV_LOG which requires at least
> 2 arguments. But the level argument was missing.
>
> Commit 7a10de5e27 fixed the logs but not the macros FUNC_PTR_OR_*
> which are not preprocessed if RTE_LIBRTE_IXGBE_DEBUG_DRIVER is disabled.
>
> Signed-off-by: Thomas Monjalon <thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
> ---
>  lib/librte_pmd_ixgbe/ixgbe_bypass.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/lib/librte_pmd_ixgbe/ixgbe_bypass.c
> b/lib/librte_pmd_ixgbe/ixgbe_bypass.c
> index 15203a4..832f415 100644
> --- a/lib/librte_pmd_ixgbe/ixgbe_bypass.c
> +++ b/lib/librte_pmd_ixgbe/ixgbe_bypass.c
> @@ -42,7 +42,7 @@
>  /* Macros to check for invlaid function pointers. */
>  #define        FUNC_PTR_OR_ERR_RET(func, retval) do {              \
>         if ((func) == NULL) {                               \
> -               PMD_DRV_LOG("%s:%d function not supported", \
> +               PMD_DRV_LOG(ERR, "%s:%d function not supported", \
>                             __func__, __LINE__);            \
>                 return retval;                            \
>         }                                                   \
> @@ -50,7 +50,7 @@
>
>  #define        FUNC_PTR_OR_RET(func) do {                          \
>         if ((func) == NULL) {                               \
> -               PMD_DRV_LOG("%s:%d function not supported", \
> +               PMD_DRV_LOG(ERR, "%s:%d function not supported", \
>                             __func__, __LINE__);            \
>                 return;                                     \
>         }                                                   \
>
>
>
Argh ... good catch.
Looks like these were the only places with this error (I did some grep and
only found those).
And ok with the ERR level, it looks fine to me.

Ack.
Thanks Thomas.

-- 
David Marchand

Re: [PATCH] ixgbe: fix build with bypass and debug enabled

[Thomas Monjalon]

> > Since commit aae1047905621 ("use the right debug macro"),
> > DEBUGOUT was replaced by PMD_DRV_LOG which requires at least
> > 2 arguments. But the level argument was missing.
> >
> > Commit 7a10de5e27 fixed the logs but not the macros FUNC_PTR_OR_*
> > which are not preprocessed if RTE_LIBRTE_IXGBE_DEBUG_DRIVER is disabled.
> >
> > Signed-off-by: Thomas Monjalon <thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
> 
> Argh ... good catch.
> Looks like these were the only places with this error (I did some grep and
> only found those).
> And ok with the ERR level, it looks fine to me.
> 
> Ack.

Applied

-- 
Thomas