Author: marius
Date: Thu Jun 19 09:08:20 2014
New Revision: 267638
URL: http://svnweb.freebsd.org/changeset/base/267638

Log:
  Don't denounce peripherals on system shutdown. Together with r267321,
  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
  MFC after:    3 days
  Sponsored by: Bally Wulff Games & Entertainment GmbH

Modified:
  head/sys/cam/cam_periph.c

Modified: head/sys/cam/cam_periph.c
==============================================================================
--- head/sys/cam/cam_periph.c   Thu Jun 19 08:13:53 2014        (r267637)
+++ head/sys/cam/cam_periph.c   Thu Jun 19 09:08:20 2014        (r267638)
@@ -597,7 +597,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;
@@ -663,9 +663,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) {
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to