upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 00:32:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

cam xpt_*nounce_periph*: Various fixes for periphs without a protocol

Browse source 
If the periph doesn't have a valid protocol, these routines emit
fallback messages.  However, the fallback messages duplicated the
periph name and unit number, and in the case of *denounce* included a
spurious newline.

Reviewed by:	mav, imp
Sponsored by:	Chelsio Communications
Differential Revision:	https://reviews.freebsd.org/D41177
This commit is contained in:
John Baldwin 2023-08-01 15:20:25 -07:00
parent 0be27bde5f
commit 76b2e3907c
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sys/cam/cam_xpt.c
View file

@ -1067,9 +1067,7 @@ xpt_announce_periph(struct cam_periph *periph, char *announce_string)
if (proto)
proto->ops->announce(path->device);
else
printf("%s%d: Unknown protocol device %d\n",
periph->periph_name, periph->unit_number,
path->device->protocol);
printf("Unknown protocol device %d\n", path->device->protocol);
if (path->device->serial_num_len > 0) {
/* Don't wrap the screen - print only the first 60 chars */
printf("%s%d: Serial Number %.60s\n", periph->periph_name,
@ -1124,8 +1122,7 @@ xpt_announce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb,
if (proto)
proto->ops->announce_sbuf(path->device, sb);
else
sbuf_printf(sb, "%s%d: Unknown protocol device %d\n",
periph->periph_name, periph->unit_number,
sbuf_printf(sb, "Unknown protocol device %d\n",
path->device->protocol);
if (path->device->serial_num_len > 0) {
/* Don't wrap the screen - print only the first 60 chars */
@ -1191,9 +1188,7 @@ xpt_denounce_periph(struct cam_periph *periph)
if (proto)
proto->ops->denounce(path->device);
else
printf("%s%d: Unknown protocol device %d\n",
periph->periph_name, periph->unit_number,
path->device->protocol);
printf("Unknown protocol device %d", path->device->protocol);
if (path->device->serial_num_len > 0)
printf(" s/n %.60s", path->device->serial_num);
printf(" detached\n");
@ -1231,8 +1226,7 @@ xpt_denounce_periph_sbuf(struct cam_periph *periph, struct sbuf *sb)
if (proto)
proto->ops->denounce_sbuf(path->device, sb);
else
sbuf_printf(sb, "%s%d: Unknown protocol device %d\n",
periph->periph_name, periph->unit_number,
sbuf_printf(sb, "Unknown protocol device %d",
path->device->protocol);
if (path->device->serial_num_len > 0)
sbuf_printf(sb, " s/n %.60s", path->device->serial_num);