Add vargs to panic

1d51329a · Silas Boyd-Wickizer · aa9350de · 1d51329a · 1d51329a
--- a/console.c
+++ b/console.c
@@ -192,16 +192,19 @@ kerneltrap(struct trapframe *tf)
    ;
 }
-void __noret__
+void
-panic(const char *s)
+panic(const char *fmt, ...)
 {
  extern void sys_halt();
+  va_list ap;
  cli();
  acquire(&cons.lock);
  __cprintf("cpu%d: panic: ", mycpu()->id);
-  __cprintf(s);
+  va_start(ap, fmt);
+  vprintfmt(writecons, 0, fmt, ap);
+  va_end(ap);
  __cprintf("\n");
  stacktrace();

--- a/kernel.h
+++ b/kernel.h
@@ -45,7 +45,8 @@ void            cv_tick(void);
 // console.c
 void            cprintf(const char*, ...) __attribute__((format(printf, 1, 2)));
-void            panic(const char*) __noret__;
+void            panic(const char*, ...) 
+                  __noret__ __attribute__((format(printf, 1, 2)));
 void            kerneltrap(struct trapframe *tf) __noret__;
 void            snprintf(char *buf, u32 n, char *fmt, ...);
 void            consoleintr(int(*)(void));