Jacob Garber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33153
Change subject: console: Make die() and friends variadic ......................................................................
console: Make die() and friends variadic
die() currently only accepts a fixed message string, which is rather inconvenient when there is extra information that would be helpful to print in the error message. This currently requires an extra call to printk(), which is somewhat awkward:
printk(BIOS_EMERG, "Bad table, opcode %d at %d", id, i); die(""); // what do I say here?
die() already has a printk() inside it to print the error message, so let's just make it variadic to combine the two.
die("Bad table, opcode %d at %d", id, i); // much better
Forwarding variadic arguments from one function to another is rather tricky, so die_with_post_code() is redefined as a variadic macro instead.
Change-Id: I28b9eac32899a1aa89e086e0d3889b75459581aa Signed-off-by: Jacob Garber jgarber1@ualberta.ca --- M src/console/die.c M src/include/console/console.h 2 files changed, 10 insertions(+), 11 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/53/33153/1
diff --git a/src/console/die.c b/src/console/die.c index 513d1c4..3a17126 100644 --- a/src/console/die.c +++ b/src/console/die.c @@ -30,17 +30,15 @@ }
/* Report a fatal error */ -void __noreturn die(const char *msg) +void __noreturn die(const char *fmt, ...) { - printk(BIOS_EMERG, "%s", msg); + va_list args; + + va_start(args, fmt); + vprintk(BIOS_EMERG, fmt, args); + va_end(args); + die_notify(); halt(); } - -/* Report a fatal error with a post code */ -void __noreturn die_with_post_code(uint8_t value, const char *msg) -{ - post_code(value); - die(msg); -} #endif diff --git a/src/include/console/console.h b/src/include/console/console.h index 082ba29..369ce5b 100644 --- a/src/include/console/console.h +++ b/src/include/console/console.h @@ -42,8 +42,9 @@ #endif /* this function is weak and can be overridden by a mainboard function. */ void mainboard_post(u8 value); -void __noreturn die(const char *msg); -void __noreturn die_with_post_code(uint8_t value, const char *msg); +void __noreturn die(const char *fmt, ...); +#define die_with_post_code(value, fmt, ...) \ + do { post_code(value); die(fmt, ##__VA_ARGS__); } while (0)
/* * This function is weak and can be overridden to provide additional
Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33153 )
Change subject: console: Make die() and friends variadic ......................................................................
Patch Set 3: Code-Review+2
Keith Short has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33153 )
Change subject: console: Make die() and friends variadic ......................................................................
Patch Set 3: Code-Review+1
Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/33153 )
Change subject: console: Make die() and friends variadic ......................................................................
console: Make die() and friends variadic
die() currently only accepts a fixed message string, which is rather inconvenient when there is extra information that would be helpful to print in the error message. This currently requires an extra call to printk(), which is somewhat awkward:
printk(BIOS_EMERG, "Bad table, opcode %d at %d", id, i); die(""); // what do I say here?
die() already has a printk() inside it to print the error message, so let's just make it variadic to combine the two.
die("Bad table, opcode %d at %d", id, i); // much better
Forwarding variadic arguments from one function to another is rather tricky, so die_with_post_code() is redefined as a variadic macro instead.
Change-Id: I28b9eac32899a1aa89e086e0d3889b75459581aa Signed-off-by: Jacob Garber jgarber1@ualberta.ca Reviewed-on: https://review.coreboot.org/c/coreboot/+/33153 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Martin Roth martinroth@google.com Reviewed-by: Keith Short keithshort@chromium.org --- M src/console/die.c M src/include/console/console.h 2 files changed, 10 insertions(+), 11 deletions(-)
Approvals: build bot (Jenkins): Verified Martin Roth: Looks good to me, approved Keith Short: Looks good to me, but someone else must approve
diff --git a/src/console/die.c b/src/console/die.c index 513d1c4..3a17126 100644 --- a/src/console/die.c +++ b/src/console/die.c @@ -30,17 +30,15 @@ }
/* Report a fatal error */ -void __noreturn die(const char *msg) +void __noreturn die(const char *fmt, ...) { - printk(BIOS_EMERG, "%s", msg); + va_list args; + + va_start(args, fmt); + vprintk(BIOS_EMERG, fmt, args); + va_end(args); + die_notify(); halt(); } - -/* Report a fatal error with a post code */ -void __noreturn die_with_post_code(uint8_t value, const char *msg) -{ - post_code(value); - die(msg); -} #endif diff --git a/src/include/console/console.h b/src/include/console/console.h index 082ba29..369ce5b 100644 --- a/src/include/console/console.h +++ b/src/include/console/console.h @@ -42,8 +42,9 @@ #endif /* this function is weak and can be overridden by a mainboard function. */ void mainboard_post(u8 value); -void __noreturn die(const char *msg); -void __noreturn die_with_post_code(uint8_t value, const char *msg); +void __noreturn die(const char *fmt, ...); +#define die_with_post_code(value, fmt, ...) \ + do { post_code(value); die(fmt, ##__VA_ARGS__); } while (0)
/* * This function is weak and can be overridden to provide additional
-
Jacob Garber (Code Review) -
Keith Short (Code Review)
-
Martin Roth (Code Review)
-
Patrick Georgi (Code Review)