refactor: console log verbosity

As a cosmetic change, slighlty reduce VM/SP header log verbosity from: SP0x8001@0x0: NOTICE: Booting Secure Partition (ID: 8001) SP0x8001@0x0: Built : 00:09:27, Jul 26 2024 SP0x8001@0x0: v2.11(fvp,release):v2.11.0-39-g65442a9 SP0x8002@0x0: NOTICE: Booting Secure Partition (ID: 8002) to: [8001/0] INFO: ======================================== [8001/0] INFO: End of FF-A setup and discovery tests [8001/0] INFO: ======================================== [8002/0] NOTICE: Booting Secure Partition (ID: 8002) [8002/0] Built : 14:02:18, Jul 26 2024 Signed-off-by: Olivier Deprez <[email protected]> Change-Id: Ida76db12dae0368ba5774bfa6194035577295569
TF-Hafnium · Aug 2, 2024 · bd43209 · bd43209
1 parent 052fa62
commit bd43209
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/api.c b/src/api.c
@@ -4702,8 +4702,7 @@ void api_flush_log_buffer(struct vcpu_locked *vcpu_locked)
 	ffa_id_t vcpu_id = vcpu_index(vcpu);
 
 	buffer->chars[buffer->len] = '\0';
-	dlog("%s%#x@%#x: %s\n", ffa_is_vm_id(vm_id) ? "VM" : "SP", vm_id,
-	     vcpu_id, buffer->chars);
+	dlog("[%x %u] %s\n", vm_id, vcpu_id, buffer->chars);
 	buffer->len = 0;
 }
 

diff --git a/test/hftest/hftest.py b/test/hftest/hftest.py
@@ -41,7 +41,7 @@
 HFTEST_CTRL_GET_COMMAND_LINE = "[hftest_ctrl:get_command_line]"
 HFTEST_CTRL_FINISHED = "[hftest_ctrl:finished]"
 
-HFTEST_CTRL_JSON_REGEX = re.compile("^(VM|SP)0x[0-9a-fA-F]+@0x[0-9a-fA-F]+: ")
+HFTEST_CTRL_JSON_REGEX = re.compile("^\\[[0-9a-fA-F]+ [0-9a-fA-F]+\\] ")
 
 HF_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(
     os.path.abspath(__file__))))