d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

We can pass a format string and args to panic(), so instead of using

Browse Source 
printf() to output some information before a panic, just include that
information in the panic.

Submitted by:	bde
Reviewed by:	bde
This commit is contained in:
emaste 2011-02-04 15:45:48 +00:00
parent 17c8cc3877
commit 3060e03b87
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/dev/aac/aacvar.h
View File

@ -537,9 +537,8 @@ static __inline void \
aac_enqueue_ ## name (struct aac_command *cm) \
{ \
if ((cm->cm_flags & AAC_ON_AACQ_MASK) != 0) { \
printf("command %p is on another queue, flags = %#x\n", \
cm, cm->cm_flags); \
panic("aac: command is on another queue"); \
panic("aac: command %p is on another queue, flags = %#x", \
cm, cm->cm_flags); \
} \
TAILQ_INSERT_TAIL(&cm->cm_sc->aac_ ## name, cm, cm_link); \
cm->cm_flags |= AAC_ON_ ## index; \
@ -549,9 +548,8 @@ static __inline void \
aac_requeue_ ## name (struct aac_command *cm) \
{ \
if ((cm->cm_flags & AAC_ON_AACQ_MASK) != 0) { \
printf("command %p is on another queue, flags = %#x\n", \
cm, cm->cm_flags); \
panic("aac: command is on another queue"); \
panic("aac: command %p is on another queue, flags = %#x", \
cm, cm->cm_flags); \
} \
TAILQ_INSERT_HEAD(&cm->cm_sc->aac_ ## name, cm, cm_link); \
cm->cm_flags |= AAC_ON_ ## index; \
@ -564,10 +562,8 @@ aac_dequeue_ ## name (struct aac_softc *sc) \
\
if ((cm = TAILQ_FIRST(&sc->aac_ ## name)) != NULL) { \
if ((cm->cm_flags & AAC_ON_ ## index) == 0) { \
printf("command %p not in queue, flags = %#x, " \
"bit = %#x\n", cm, cm->cm_flags, \
AAC_ON_ ## index); \
panic("aac: command not in queue"); \
panic("aac: command %p not in queue, flags = %#x, bit = %#x", \
cm, cm->cm_flags, AAC_ON_ ## index); \
} \
TAILQ_REMOVE(&sc->aac_ ## name, cm, cm_link); \
cm->cm_flags &= ~AAC_ON_ ## index; \
@ -579,10 +575,8 @@ static __inline void \
aac_remove_ ## name (struct aac_command *cm) \
{ \
if ((cm->cm_flags & AAC_ON_ ## index) == 0) { \
printf("command %p not in queue, flags = %#x, " \
"bit = %#x\n", cm, cm->cm_flags, \
AAC_ON_ ## index); \
panic("aac: command not in queue"); \
panic("aac: command %p not in queue, flags = %#x, bit = %#x", \
cm, cm->cm_flags, AAC_ON_ ## index); \
} \
TAILQ_REMOVE(&cm->cm_sc->aac_ ## name, cm, cm_link); \
cm->cm_flags &= ~AAC_ON_ ## index; \