diff mbox

[dpdk-dev] ixgbe: fix build with bypass and debug enabled

Message ID 1417455659-24854-1-git-send-email-thomas.monjalon@6wind.com (mailing list archive)
State Accepted, archived
Headers show

Commit Message

Thomas Monjalon Dec. 1, 2014, 5:40 p.m. UTC
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@6wind.com>
---
 lib/librte_pmd_ixgbe/ixgbe_bypass.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

David Marchand Dec. 1, 2014, 8:07 p.m. UTC | #1
On Mon, Dec 1, 2014 at 6:40 PM, Thomas Monjalon <thomas.monjalon@6wind.com>
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@6wind.com>
> ---
>  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.
Thomas Monjalon Dec. 2, 2014, 11:28 a.m. UTC | #2
> > 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@6wind.com>
> 
> 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
diff mbox

Patch

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;                                     \
 	}                                                   \