From: Julien Grall Date: Mon, 19 Aug 2019 17:13:05 +0000 (+0100) Subject: xen/console: Fix build when CONFIG_DEBUG_TRACE=y X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e0bf98394ee06b9f365684269b1de091c31d8d9c;p=people%2Flarsk%2Fxen.git xen/console: Fix build when CONFIG_DEBUG_TRACE=y Commit b5e6e1ee8da "xen/console: Don't treat NUL character as the end of the buffer" extended sercon_puts to take the number of character to print in argument. Sadly, a couple of couple of the callers in debugtrace_dump_worker() were not converted. This result to a build failure when enabling CONFIG_DEBUG_TRACE. Spotted by Travis using randconfig Signed-off-by: Julien Grall Acked-by: Andrew Cooper --- diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 2c14c2ca73..75e493466e 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -1185,11 +1185,13 @@ static void debugtrace_dump_worker(void) /* Print oldest portion of the ring. */ ASSERT(debugtrace_buf[debugtrace_bytes - 1] == 0); - sercon_puts(&debugtrace_buf[debugtrace_prd]); + if ( debugtrace_buf[debugtrace_prd] != '\0' ) + sercon_puts(&debugtrace_buf[debugtrace_prd], + strlen(&debugtrace_buf[debugtrace_prd])); /* Print youngest portion of the ring. */ debugtrace_buf[debugtrace_prd] = '\0'; - sercon_puts(&debugtrace_buf[0]); + sercon_puts(&debugtrace_buf[0], debugtrace_prd); memset(debugtrace_buf, '\0', debugtrace_bytes);