commit 2f63c47f30f14ec941210ab801fb627a510e369c
author Francois Rousseau <frousseau@google.com> Mon Aug 13 09:33:08 2018 -0700
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Mon Aug 13 18:54:01 2018 +0000
tree d13aef85bdf8ce4f9786c95306c4d319ef24a481
parent 857668e516c0083fbf7e82e6ad9ec6eaa047f64f

[kernel] bluescreen only on panic in platform_halt()

we don't want to generate a kernel crash log on other reasons than a panic

ZX-2476

TESTED=assert(false) in devmgr's main() no longer generates a crash report

Change-Id: I4eb91be4230d163369731183262c5210af01dbea

kernel/platform/generic-arm/platform.cpp

diff --git a/kernel/platform/generic-arm/platform.cpp b/kernel/platform/generic-arm/platform.cpp
index e593b8f..a078be2 100644
--- a/kernel/platform/generic-arm/platform.cpp
+++ b/kernel/platform/generic-arm/platform.cpp
@@ -471,12 +471,11 @@
         power_shutdown();
     }
 
-#if WITH_LIB_DEBUGLOG
-    thread_print_current_backtrace();
-    dlog_bluescreen_halt();
-#endif
-
     if (reason == HALT_REASON_SW_PANIC) {
+#if WITH_LIB_DEBUGLOG
+        thread_print_current_backtrace();
+        dlog_bluescreen_halt();
+#endif
         if (!halt_on_panic) {
             power_reboot(REBOOT_NORMAL);
             printf("reboot failed\n");

kernel/platform/pc/power.cpp

diff --git a/kernel/platform/pc/power.cpp b/kernel/platform/pc/power.cpp
index f379b28..e2a2de5 100644
--- a/kernel/platform/pc/power.cpp
+++ b/kernel/platform/pc/power.cpp
@@ -117,10 +117,12 @@
         break;
     }
 
+    if (reason == HALT_REASON_SW_PANIC) {
 #if WITH_LIB_DEBUGLOG
-    thread_print_current_backtrace();
-    dlog_bluescreen_halt();
+        thread_print_current_backtrace();
+        dlog_bluescreen_halt();
 #endif
+    }
 
     if (!halt_on_panic) {
         printf("Rebooting...\n");