soc_qemu: update UART support

This commit adds missing DEBUG trace_id for QEMU UART driver. Signed-off-by: Stephany Gamiz <quic_sgamiz@quicinc.com>
NyxCipher · Oct 27, 2021 · 808b386 · 808b386
1 parent 0579fe3
commit 808b386
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/hyp/interfaces/trace/trace.tc b/hyp/interfaces/trace/trace.tc
@@ -15,6 +15,7 @@ define trace_class enumeration() {
 define trace_id enumeration(explicit) {
 	INFO = 0;
 	WARN = 1;
+	DEBUG = 3;
 };
 
 #if defined(HYPERCALLS)

diff --git a/hyp/misc/log_standard/src/log.c b/hyp/misc/log_standard/src/log.c
@@ -79,7 +79,7 @@ log_standard_handle_trace_log(trace_id_t id, trace_action_t action,
 		      arg3, arg4);
 	if (ret.e == ERROR_STRING_TRUNCATED) {
 		size = LOG_TEMP_BUFFER_SIZE;
-	} else if (ret.e == ERROR_STRING_MISSING_ARGUMENT) {
+	} else if ((ret.e == ERROR_STRING_MISSING_ARGUMENT) || (ret.r == 0U)) {
 		goto out;
 	} else {
 		size = ret.r + 1;

diff --git a/hyp/platform/soc_qemu/src/uart.c b/hyp/platform/soc_qemu/src/uart.c
@@ -75,11 +75,7 @@ soc_qemu_handle_log_message(trace_id_t id, const char *str)
 	soc_qemu_console_puts(str);
 #else
 	if ((id == TRACE_ID_WARN) || (id == TRACE_ID_PANIC) ||
-	    (id == TRACE_ID_ASSERT_FAILED) ||
-#if defined(INTERFACE_TESTS)
-	    (id == TRACE_ID_TEST) ||
-#endif
-	    (id == TRACE_ID_DEBUG)) {
+	    (id == TRACE_ID_ASSERT_FAILED) || (id == TRACE_ID_DEBUG)) {
 		soc_qemu_console_puts(str);
 	}
 #endif