Author: marius
Date: Mon Jun 23 08:32:45 2014
New Revision: 267779
URL: http://svnweb.freebsd.org/changeset/base/267779
Log:
MFC: r267638
Don't denounce peripherals on system shutdown. Together with r267321
(MFCed to stable/9 in r267777), we're now back to the pre-r228483
level of default verbosity. This in turn again typically allows for
reading information that userland might have printed on the screen
before initiating a halt, but still permits to debug potential device
shutdown problems on system shutdown via CAM_DEBUG etc.
Reviewed by: mav
Sponsored by: Bally Wulff Games & Entertainment GmbH
Modified:
stable/9/sys/cam/cam_periph.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/cam/cam_periph.c
==============================================================================
--- stable/9/sys/cam/cam_periph.c Mon Jun 23 08:32:36 2014
(r267778)
+++ stable/9/sys/cam/cam_periph.c Mon Jun 23 08:32:45 2014
(r267779)
@@ -586,7 +586,7 @@ cam_periph_invalidate(struct cam_periph
return;
CAM_DEBUG(periph->path, CAM_DEBUG_INFO, ("Periph invalidated\n"));
- if (periph->flags & CAM_PERIPH_ANNOUNCED)
+ if ((periph->flags & CAM_PERIPH_ANNOUNCED) && !rebooting)
xpt_denounce_periph(periph);
periph->flags |= CAM_PERIPH_INVALID;
periph->flags &= ~CAM_PERIPH_NEW_DEV_FOUND;
@@ -650,9 +650,9 @@ camperiphfree(struct cam_periph *periph)
xpt_remove_periph(periph);
xpt_unlock_buses();
- if (periph->flags & CAM_PERIPH_ANNOUNCED) {
+ if ((periph->flags & CAM_PERIPH_ANNOUNCED) && !rebooting)
xpt_print(periph->path, "Periph destroyed\n");
- } else
+ else
CAM_DEBUG(periph->path, CAM_DEBUG_INFO, ("Periph destroyed\n"));
if (periph->flags & CAM_PERIPH_NEW_DEV_FOUND) {
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
