log: remove log level config option

Remove RTE_LOG_LEVEL config option, use existing RTE_LOG_DP_LEVEL config
option for controlling datapath log level.
RTE_LOG_LEVEL is no longer needed as dynamic logging can be used to
control global and module specific log levels.

Signed-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
Reviewed-by: Olivier Matz <olivier.matz@6wind.com>

diff --git a/config/common_base b/config/common_base
index 1323a5c9c9c69a2423db6ed9138dfb2ed8c6a19b..3a2a8deabc32431e964d7f31ee9eb45289db3a8a 100644 (file)
--- a/config/common_base
+++ b/config/common_base
@@ -94,7 +94,6 @@ CONFIG_RTE_MAX_MEMSEG=256
 CONFIG_RTE_MAX_MEMZONE=2560
 CONFIG_RTE_MAX_TAILQ=32
 CONFIG_RTE_ENABLE_ASSERT=n
-CONFIG_RTE_LOG_LEVEL=RTE_LOG_INFO
 CONFIG_RTE_LOG_DP_LEVEL=RTE_LOG_INFO
 CONFIG_RTE_LOG_HISTORY=256
 CONFIG_RTE_BACKTRACE=y

diff --git a/devtools/test-build.sh b/devtools/test-build.sh
index b551764d446ba1c0b1a01a888389306da3264755..77a2a47ac6af09478ffa30ab65afbe7ccaa99c3f 100755 (executable)
--- a/devtools/test-build.sh
+++ b/devtools/test-build.sh
@@ -157,7 +157,7 @@ config () # <directory> <target> <options>
                ! echo $3 | grep -q '+shared' || \
                sed -ri         's,(SHARED_LIB=)n,\1y,' $1/.config
                ! echo $3 | grep -q '+debug' || ( \
-               sed -ri     's,(RTE_LOG_LEVEL=).*,\1RTE_LOG_DEBUG,' $1/.config
+               sed -ri  's,(RTE_LOG_DP_LEVEL=).*,\1RTE_LOG_DEBUG,' $1/.config
                sed -ri           's,(_DEBUG.*=)n,\1y,' $1/.config
                sed -ri            's,(_STAT.*=)n,\1y,' $1/.config
                sed -ri 's,(TEST_PMD_RECORD_.*=)n,\1y,' $1/.config )

diff --git a/doc/guides/faq/faq.rst b/doc/guides/faq/faq.rst
index dac8050995fbc6bdfebd29acc58ff5f357066bc1..55dcfe9c2e0879b6c62bd3a1360b03daa6213e4d 100644 (file)
--- a/doc/guides/faq/faq.rst
+++ b/doc/guides/faq/faq.rst
@@ -103,9 +103,6 @@ Yes, the option ``--log-level=`` accepts one of these numbers:
     #define RTE_LOG_INFO 7U     /* Informational. */
     #define RTE_LOG_DEBUG 8U    /* Debug-level messages. */
 
-It is also possible to change the default level at compile time
-with ``CONFIG_RTE_LOG_LEVEL``.
-
 
 How can I tune my network application to achieve lower latency?
 ---------------------------------------------------------------

diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h
index accecf51847dd2ca9726584ceaef234c09df0130..8cba319ebb277e00fb8d869f14691c2a2536a1c4 100644 (file)
--- a/drivers/net/ena/base/ena_plat_dpdk.h
+++ b/drivers/net/ena/base/ena_plat_dpdk.h
@@ -96,7 +96,7 @@ typedef uint64_t dma_addr_t;
 #define ENA_GET_SYSTEM_USECS()                                         \
        (rte_get_timer_cycles() * US_PER_S / rte_get_timer_hz())
 
-#if RTE_LOG_LEVEL >= RTE_LOG_DEBUG
+#if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG
 #define ENA_ASSERT(cond, format, arg...)                               \
        do {                                                            \
                if (unlikely(!(cond))) {                                \

diff --git a/drivers/net/sfc/sfc_debug.h b/drivers/net/sfc/sfc_debug.h
index 09c2775d7b6a1bcda97fb2e8193baae9e5a311a4..6b600ff4d5b90ec363739e9e2d23ecc034477f27 100644 (file)
--- a/drivers/net/sfc/sfc_debug.h
+++ b/drivers/net/sfc/sfc_debug.h
@@ -13,7 +13,7 @@
 #include <rte_debug.h>
 
 #ifdef RTE_LIBRTE_SFC_EFX_DEBUG
-/* Avoid dependency from RTE_LOG_LEVEL to be able to enable debug check
+/* Avoid dependency from RTE_LOG_DP_LEVEL to be able to enable debug check
  * in the driver only.
  */
 #define SFC_ASSERT(exp)                        RTE_VERIFY(exp)

diff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c
index 5ce56349087a6de6c473d3752857aced32b8ab5d..903add311f84e91a465fde4ce6987e26e80c435b 100644 (file)
--- a/examples/l3fwd-acl/main.c
+++ b/examples/l3fwd-acl/main.c
@@ -39,7 +39,7 @@
 #include <rte_string_fns.h>
 #include <rte_acl.h>
 
-#if RTE_LOG_LEVEL >= RTE_LOG_DEBUG
+#if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG
 #define L3FWDACL_DEBUG
 #endif
 #define DO_RFC_1812_CHECKS