kernel/logging: Change default log level to LOG_NOTE

The previous default was LOG_DEBUG with an incorrect level check on the
kernel debug macro.

Signed-off-by: Moritz Hoffmann <moritz.hoffmann@inf.ethz.ch>

diff --git a/doc/018-Practical-guide/helloWorldApp.tex b/doc/018-Practical-guide/helloWorldApp.tex
index 7d268d9..5e95bbb 100644 (file)
--- a/doc/018-Practical-guide/helloWorldApp.tex
+++ b/doc/018-Practical-guide/helloWorldApp.tex
@@ -402,8 +402,8 @@ on which architecture you are targeting.  Bellow is the minimal
 \begin{verbatim}
 title  Barrelfish
 root   (nd)
-kernel /x86_64/sbin/elver loglevel=4
-module /x86_64/sbin/cpu loglevel=4
+kernel /x86_64/sbin/elver loglevel=3
+module /x86_64/sbin/cpu loglevel=3
 module /x86_64/sbin/init
 
 # Domains spawned by init

diff --git a/doc/022-armv8/report.tex b/doc/022-armv8/report.tex
index 16bf63b..6a3ecac 100644 (file)
--- a/doc/022-armv8/report.tex
+++ b/doc/022-armv8/report.tex
@@ -729,12 +729,12 @@ from the same TFTP server used to load it. The format is intended to be as
 close as practical to that of an old-style GRUB menu.lst file. The example
 configuration in \autoref{f:hag_config} loads
 \texttt{/armv8/sbin/cpu\_apm88xxxx} as the CPU driver, with arguments
-\texttt{loglevel=4}, and an 8192B (2-page) stack.
+\texttt{loglevel=3}, and an 8192B (2-page) stack.
 
 \begin{figure}[htb]
 \begin{center}
 \begin{lstlisting}
-kernel /armv8/sbin/cpu_apm88xxxx loglevel=4
+kernel /armv8/sbin/cpu_apm88xxxx loglevel=3
 stack 8192
 module /armv8/sbin/cpu_apm88xxxx
 module /armv8/sbin/init

diff --git a/hake/foundation.cfg b/hake/foundation.cfg
index c18422b..4ffa51b 100644 (file)
--- a/hake/foundation.cfg
+++ b/hake/foundation.cfg
@@ -6,5 +6,5 @@
 
 title  Barrelfish
 stack   16384
-kernel /armv8/sbin/cpu_foundation loglevel=4
+kernel /armv8/sbin/cpu_foundation loglevel=3
 module /armv8/sbin/init

diff --git a/hake/fvp.cfg b/hake/fvp.cfg
index c18422b..4ffa51b 100644 (file)
--- a/hake/fvp.cfg
+++ b/hake/fvp.cfg
@@ -6,5 +6,5 @@
 
 title  Barrelfish
 stack   16384
-kernel /armv8/sbin/cpu_foundation loglevel=4
+kernel /armv8/sbin/cpu_foundation loglevel=3
 module /armv8/sbin/init

diff --git a/hake/menu.lst.armv7_a15a7ve b/hake/menu.lst.armv7_a15a7ve
index b83f0d5..fcae6ec 100644 (file)
--- a/hake/menu.lst.armv7_a15a7ve
+++ b/hake/menu.lst.armv7_a15a7ve
@@ -9,7 +9,7 @@ timeout 0
 
 title  Barrelfish
 #root  (nd)
-kernel /armv7/sbin/cpu_a15ve loglevel=4 periphbase=0x2c000000 cntfrq=100000000 consolePort=0 timerirq=29
+kernel /armv7/sbin/cpu_a15ve loglevel=3 periphbase=0x2c000000 cntfrq=100000000 consolePort=0 timerirq=29
 module /armv7/sbin/cpu_a15ve
 module /armv7/sbin/init
 

diff --git a/hake/menu.lst.armv7_a15ve_1 b/hake/menu.lst.armv7_a15ve_1
index 60e2015..5c322c0 100644 (file)
--- a/hake/menu.lst.armv7_a15ve_1
+++ b/hake/menu.lst.armv7_a15ve_1
@@ -9,7 +9,7 @@ timeout 0
 
 title  Barrelfish
 #root  (nd)
-kernel /armv7/sbin/cpu_a15ve loglevel=4 periphbase=0x2c000000 consolePort=0
+kernel /armv7/sbin/cpu_a15ve loglevel=3 periphbase=0x2c000000 consolePort=0
 module /armv7/sbin/cpu_a15ve
 module /armv7/sbin/init
 

diff --git a/hake/menu.lst.armv7_a15ve_4 b/hake/menu.lst.armv7_a15ve_4
index 3d32c01..20ea3fe 100644 (file)
--- a/hake/menu.lst.armv7_a15ve_4
+++ b/hake/menu.lst.armv7_a15ve_4
@@ -9,7 +9,7 @@ timeout 0
 
 title  Barrelfish
 #root  (nd)
-kernel /armv7/sbin/cpu_a15ve loglevel=4 periphbase=0x2c000000 consolePort=0
+kernel /armv7/sbin/cpu_a15ve loglevel=3 periphbase=0x2c000000 consolePort=0
 module /armv7/sbin/cpu_a15ve
 module /armv7/sbin/init
 

diff --git a/hake/menu.lst.armv7_a15ve_fvp_1 b/hake/menu.lst.armv7_a15ve_fvp_1
index c61f11c..56143e9 100644 (file)
--- a/hake/menu.lst.armv7_a15ve_fvp_1
+++ b/hake/menu.lst.armv7_a15ve_fvp_1
@@ -9,7 +9,7 @@ timeout 0
 
 title  Barrelfish
 #root  (nd)
-kernel /armv7/sbin/cpu_a15ve loglevel=4 periphbase=0x2c000000 cntfrq=100000000 consolePort=0 timerirq=29
+kernel /armv7/sbin/cpu_a15ve loglevel=3 periphbase=0x2c000000 cntfrq=100000000 consolePort=0 timerirq=29
 module /armv7/sbin/cpu_a15ve
 module /armv7/sbin/init
 

diff --git a/hake/menu.lst.armv7_a15ve_fvp_4 b/hake/menu.lst.armv7_a15ve_fvp_4
index c3ae307..f70fa5d 100644 (file)
--- a/hake/menu.lst.armv7_a15ve_fvp_4
+++ b/hake/menu.lst.armv7_a15ve_fvp_4
@@ -9,7 +9,7 @@ timeout 0
 
 title  Barrelfish
 #root  (nd)
-kernel /armv7/sbin/cpu_a15ve loglevel=4 periphbase=0x2c000000 cntfrq=100000000 consolePort=0 timerirq=29
+kernel /armv7/sbin/cpu_a15ve loglevel=3 periphbase=0x2c000000 cntfrq=100000000 consolePort=0 timerirq=29
 module /armv7/sbin/cpu_a15ve
 module /armv7/sbin/init
 

diff --git a/hake/menu.lst.armv7_a15ve_gem5 b/hake/menu.lst.armv7_a15ve_gem5
index df48f1a..f499e98 100644 (file)
--- a/hake/menu.lst.armv7_a15ve_gem5
+++ b/hake/menu.lst.armv7_a15ve_gem5
@@ -9,7 +9,7 @@ timeout 0
 
 title  Barrelfish
 #root  (nd)
-kernel /armv7/sbin/cpu_a15ve loglevel=4 periphbase=0x2c000000 consolePort=0 timerirq=29
+kernel /armv7/sbin/cpu_a15ve loglevel=3 periphbase=0x2c000000 consolePort=0 timerirq=29
 module /armv7/sbin/cpu_a15ve
 module /armv7/sbin/init
 

diff --git a/hake/menu.lst.armv7_omap44xx b/hake/menu.lst.armv7_omap44xx
index b774ae3..b5d83a7 100644 (file)
--- a/hake/menu.lst.armv7_omap44xx
+++ b/hake/menu.lst.armv7_omap44xx
@@ -7,7 +7,7 @@ timeout 0
 
 title Barrelfish
 #root (nd)
-kernel /armv7/sbin/cpu_omap44xx loglevel=4 consolePort=2
+kernel /armv7/sbin/cpu_omap44xx loglevel=3 consolePort=2
 module /armv7/sbin/cpu_omap44xx
 module /armv7/sbin/init
 

diff --git a/hake/menu.lst.armv7_zynq7 b/hake/menu.lst.armv7_zynq7
index 2e162ad..55be5ab 100644 (file)
--- a/hake/menu.lst.armv7_zynq7
+++ b/hake/menu.lst.armv7_zynq7
@@ -8,7 +8,7 @@ timeout 0
 # set using 'qemu-system-arm -append ...'.
 
 title  Barrelfish
-kernel /armv7/sbin/cpu_zynq7 loglevel=4 consolePort=1
+kernel /armv7/sbin/cpu_zynq7 loglevel=3 consolePort=1
 module /armv7/sbin/cpu_zynq7
 module /armv7/sbin/init
 

diff --git a/hake/menu.lst.armv8_a57v b/hake/menu.lst.armv8_a57v
index 872c286..dc3a6d6 100644 (file)
--- a/hake/menu.lst.armv8_a57v
+++ b/hake/menu.lst.armv8_a57v
@@ -3,7 +3,7 @@
 # boot-time and the arguments they should receive.
 #
 
-kernel /armv8/sbin/cpu_a57v loglevel=4 serial=0x9000000 gicdist=0x8000000 gic=0x8010000
+kernel /armv8/sbin/cpu_a57v loglevel=3 serial=0x9000000 gicdist=0x8000000 gic=0x8010000
 stack 131072
 module /armv8/sbin/init
 

diff --git a/hake/menu.lst.armv8_gem5 b/hake/menu.lst.armv8_gem5
index 0df52e9..90cd883 100644 (file)
--- a/hake/menu.lst.armv8_gem5
+++ b/hake/menu.lst.armv8_gem5
@@ -17,7 +17,7 @@ timeout 0
 
 title  Barrelfish
 #root  (nd)
-kernel /armv8/sbin/cpu_gem5 loglevel=4
+kernel /armv8/sbin/cpu_gem5 loglevel=3
 module /armv8/sbin/cpu_gem5
 module /armv8/sbin/init
 

diff --git a/hake/menu.lst.k1om b/hake/menu.lst.k1om
index 863673e..6f122e5 100644 (file)
--- a/hake/menu.lst.k1om
+++ b/hake/menu.lst.k1om
@@ -12,7 +12,7 @@ timeout 0
 
 title  Barrelfish
 root   (nd)
-kernel /k1om/sbin/cpu loglevel=4
+kernel /k1om/sbin/cpu loglevel=3
 module /k1om/sbin/init
 
 # Domains spawned by init

diff --git a/hake/menu.lst.m5 b/hake/menu.lst.m5
index d369eef..a3c8466 100644 (file)
--- a/hake/menu.lst.m5
+++ b/hake/menu.lst.m5
@@ -12,7 +12,7 @@ timeout 0
 
 title  Barrelfish
 root   (nd)
-kernel /x86_64/sbin/cpu loglevel=4
+kernel /x86_64/sbin/cpu loglevel=3
 module /x86_64/sbin/init
 
 # Domains spawned by init

diff --git a/hake/menu.lst.x86_32 b/hake/menu.lst.x86_32
index 8760131..6d65b4c 100644 (file)
--- a/hake/menu.lst.x86_32
+++ b/hake/menu.lst.x86_32
@@ -12,8 +12,8 @@ timeout 0
 
 title  Barrelfish
 root   (nd)
-kernel /x86_32/sbin/cpu loglevel=4
-module /x86_32/sbin/cpu loglevel=4
+kernel /x86_32/sbin/cpu loglevel=3
+module /x86_32/sbin/cpu loglevel=3
 module /x86_32/sbin/init
 
 # Domains spawned by init

diff --git a/hake/menu.lst.x86_64 b/hake/menu.lst.x86_64
index d7b6adf..6161402 100644 (file)
--- a/hake/menu.lst.x86_64
+++ b/hake/menu.lst.x86_64
@@ -12,8 +12,8 @@ timeout 0
 
 title  Barrelfish
 root   (nd)
-kernel /x86_64/sbin/elver loglevel=4
-module /x86_64/sbin/cpu loglevel=4
+kernel /x86_64/sbin/elver loglevel=3
+module /x86_64/sbin/cpu loglevel=3
 module /x86_64/sbin/init
 
 # Domains spawned by init

diff --git a/kernel/include/logging.h b/kernel/include/logging.h
index d2b5f76..87744ec 100644 (file)
--- a/kernel/include/logging.h
+++ b/kernel/include/logging.h
@@ -95,7 +95,7 @@ extern int kernel_log_subsystem_mask;
 
 #define debug(_subs, _fmt, ...) \
 do { \
-    if (((_subs) & kernel_log_subsystem_mask) && (kernel_loglevel > LOG_DEBUG)) \
+    if (((_subs) & kernel_log_subsystem_mask) && (kernel_loglevel >= LOG_DEBUG)) \
         printk(LOG_DEBUG, _fmt, ## __VA_ARGS__); \
 } while(0)
 

diff --git a/tools/demo/menu.demo.lst b/tools/demo/menu.demo.lst
index ed0f3c9..73d7b6d 100644 (file)
--- a/tools/demo/menu.demo.lst
+++ b/tools/demo/menu.demo.lst
@@ -4,7 +4,7 @@
 timeout 0\r
 title   Barrelfish-demo\r
 root    (nd)\r
-kernel  /barrelfish/x86_64/sbin/cpu loglevel=4 logmask=0\r
+kernel  /barrelfish/x86_64/sbin/cpu loglevel=3 logmask=0\r
 #\r
 # Essentials\r
 #\r

diff --git a/tools/harness/tests/xeonphi.py b/tools/harness/tests/xeonphi.py
index bf1fd16..9b0276d 100644 (file)
--- a/tools/harness/tests/xeonphi.py
+++ b/tools/harness/tests/xeonphi.py
@@ -34,7 +34,7 @@ class XeonPhi_Boot_Test(TestCommon):
         f.write("title   Barrelfish \n")
         f.write("root    (nd) \n")
         f.write("kernel  /" + machine.get_tftp_subdir() + "/k1om/sbin/weever\n")
-        f.write("module  /" + machine.get_tftp_subdir() + "/k1om/sbin/cpu loglevel=4 \n")
+        f.write("module  /" + machine.get_tftp_subdir() + "/k1om/sbin/cpu loglevel=3 \n")
         f.write("module  /" + machine.get_tftp_subdir() + "/k1om/sbin/init\n")
 
         # Domains spawned by init

diff --git a/usr/examples/xmpl-call-response/menu.lst b/usr/examples/xmpl-call-response/menu.lst
index 5bd386d..4c04b36 100644 (file)
--- a/usr/examples/xmpl-call-response/menu.lst
+++ b/usr/examples/xmpl-call-response/menu.lst
@@ -12,8 +12,8 @@ timeout 0
 
 title  Barrelfish
 root   (nd)
-kernel /x86_64/sbin/elver loglevel=4
-module /x86_64/sbin/cpu loglevel=4
+kernel /x86_64/sbin/elver loglevel=3
+module /x86_64/sbin/cpu loglevel=3
 module /x86_64/sbin/init
 
 # Domains spawned by init

diff --git a/usr/examples/xmpl-hello/menu.lst b/usr/examples/xmpl-hello/menu.lst
index 96a96f8..754dd25 100644 (file)
--- a/usr/examples/xmpl-hello/menu.lst
+++ b/usr/examples/xmpl-hello/menu.lst
@@ -12,8 +12,8 @@ timeout 0
 
 title  Barrelfish
 root   (nd)
-kernel /x86_64/sbin/elver loglevel=4
-module /x86_64/sbin/cpu loglevel=4
+kernel /x86_64/sbin/elver loglevel=3
+module /x86_64/sbin/cpu loglevel=3
 module /x86_64/sbin/init
 
 # Domains spawned by init

diff --git a/usr/examples/xmpl-msg/menu.lst b/usr/examples/xmpl-msg/menu.lst
index 6be3644..8ee5451 100644 (file)
--- a/usr/examples/xmpl-msg/menu.lst
+++ b/usr/examples/xmpl-msg/menu.lst
@@ -12,8 +12,8 @@ timeout 0
 
 title  Barrelfish
 root   (nd)
-kernel /x86_64/sbin/elver loglevel=4
-module /x86_64/sbin/cpu loglevel=4
+kernel /x86_64/sbin/elver loglevel=3
+module /x86_64/sbin/cpu loglevel=3
 module /x86_64/sbin/init
 
 # Domains spawned by init

diff --git a/usr/examples/xmpl-rpc/menu.lst b/usr/examples/xmpl-rpc/menu.lst
index 0ef57a0..1ee1f38 100644 (file)
--- a/usr/examples/xmpl-rpc/menu.lst
+++ b/usr/examples/xmpl-rpc/menu.lst
@@ -12,8 +12,8 @@ timeout 0
 
 title  Barrelfish
 root   (nd)
-kernel /x86_64/sbin/elver loglevel=4
-module /x86_64/sbin/cpu loglevel=4
+kernel /x86_64/sbin/elver loglevel=3
+module /x86_64/sbin/cpu loglevel=3
 module /x86_64/sbin/init
 
 # Domains spawned by init

diff --git a/usr/examples/xmpl-span/menu.lst b/usr/examples/xmpl-span/menu.lst
index 05f7e2f..b8af818 100644 (file)
--- a/usr/examples/xmpl-span/menu.lst
+++ b/usr/examples/xmpl-span/menu.lst
@@ -12,8 +12,8 @@ timeout 0
 
 title  Barrelfish
 root   (nd)
-kernel /x86_64/sbin/elver loglevel=4
-module /x86_64/sbin/cpu loglevel=4
+kernel /x86_64/sbin/elver loglevel=3
+module /x86_64/sbin/cpu loglevel=3
 module /x86_64/sbin/init
 
 # Domains spawned by init

diff --git a/usr/examples/xmpl-spawn/menu.lst b/usr/examples/xmpl-spawn/menu.lst
index 856d06f..723366e 100644 (file)
--- a/usr/examples/xmpl-spawn/menu.lst
+++ b/usr/examples/xmpl-spawn/menu.lst
@@ -12,8 +12,8 @@ timeout 0
 
 title  Barrelfish
 root   (nd)
-kernel /x86_64/sbin/elver loglevel=4
-module /x86_64/sbin/cpu loglevel=4
+kernel /x86_64/sbin/elver loglevel=3
+module /x86_64/sbin/cpu loglevel=3
 module /x86_64/sbin/init
 
 # Domains spawned by init

diff --git a/usr/examples/xmpl-thc-binding/menu.lst b/usr/examples/xmpl-thc-binding/menu.lst
index 228372c..c82dcfc 100644 (file)
--- a/usr/examples/xmpl-thc-binding/menu.lst
+++ b/usr/examples/xmpl-thc-binding/menu.lst
@@ -12,8 +12,8 @@ timeout 0
 
 title  Barrelfish
 root   (nd)
-kernel /x86_64/sbin/elver loglevel=4
-module /x86_64/sbin/cpu loglevel=4
+kernel /x86_64/sbin/elver loglevel=3
+module /x86_64/sbin/cpu loglevel=3
 module /x86_64/sbin/init
 
 # Domains spawned by init

diff --git a/usr/examples/xmpl-thc-lang/menu.lst b/usr/examples/xmpl-thc-lang/menu.lst
index 88ee689..06b142c 100644 (file)
--- a/usr/examples/xmpl-thc-lang/menu.lst
+++ b/usr/examples/xmpl-thc-lang/menu.lst
@@ -12,8 +12,8 @@ timeout 0
 
 title  Barrelfish
 root   (nd)
-kernel /x86_64/sbin/elver loglevel=4
-module /x86_64/sbin/cpu loglevel=4
+kernel /x86_64/sbin/elver loglevel=3
+module /x86_64/sbin/cpu loglevel=3
 module /x86_64/sbin/init
 
 # Domains spawned by init

diff --git a/usr/examples/xmpl-thread/menu.lst b/usr/examples/xmpl-thread/menu.lst
index b4294a2..fc7b6ac 100644 (file)
--- a/usr/examples/xmpl-thread/menu.lst
+++ b/usr/examples/xmpl-thread/menu.lst
@@ -12,8 +12,8 @@ timeout 0
 
 title  Barrelfish
 root   (nd)
-kernel /x86_64/sbin/elver loglevel=4
-module /x86_64/sbin/cpu loglevel=4
+kernel /x86_64/sbin/elver loglevel=3
+module /x86_64/sbin/cpu loglevel=3
 module /x86_64/sbin/init
 
 # Domains spawned by init

diff --git a/usr/examples/xmpl-trace/menu.lst b/usr/examples/xmpl-trace/menu.lst
index b8b2952..1c51634 100644 (file)
--- a/usr/examples/xmpl-trace/menu.lst
+++ b/usr/examples/xmpl-trace/menu.lst
@@ -12,8 +12,8 @@ timeout 0
 
 title  Barrelfish
 root   (nd)
-kernel /x86_64/sbin/elver loglevel=4
-module /x86_64/sbin/cpu loglevel=4
+kernel /x86_64/sbin/elver loglevel=3
+module /x86_64/sbin/cpu loglevel=3
 module /x86_64/sbin/init
 
 # Domains spawned by init

diff --git a/usr/mem_serv_dist/menu-mem.lst b/usr/mem_serv_dist/menu-mem.lst
index 7894269..b2b1a98 100644 (file)
--- a/usr/mem_serv_dist/menu-mem.lst
+++ b/usr/mem_serv_dist/menu-mem.lst
@@ -12,8 +12,8 @@ timeout 0
 
 title  Barrelfish
 root   (nd)
-kernel /kuzi/x86_64/sbin/cpu loglevel=4
-module /kuzi/x86_64/sbin/cpu loglevel=4
+kernel /kuzi/x86_64/sbin/cpu loglevel=3
+module /kuzi/x86_64/sbin/cpu loglevel=3
 module /kuzi/x86_64/sbin/init
 
 # Domains spawned by init

diff --git a/usr/startd/README.txt b/usr/startd/README.txt
index 547b513..2466f79 100644 (file)
--- a/usr/startd/README.txt
+++ b/usr/startd/README.txt
@@ -20,8 +20,8 @@ timeout 0
 
 title   Barrelfish
 root    (nd)
-kernel  /x86_64/sbin/elver loglevel=4
-module  /x86_64/sbin/cpu loglevel=4
+kernel  /x86_64/sbin/elver loglevel=3
+module  /x86_64/sbin/cpu loglevel=3
 module  /x86_64/sbin/init
 
 # Domains spawned by init