Attachment 83797 Details for Bug 119668 – verboseness.diff

[patch] verboseness.diff

verboseness.diff (text/plain), 2.58 KB, created by Andriy Gapon on 2008-01-14 17:20:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Gapon

Created: 2008-01-14 17:20:02 UTC

Size: 2.58 KB

patch

obsolete

>--- sys/cam/scsi/scsi_all.h.orig	Fri Dec 21 17:52:50 2007
>+++ sys/cam/scsi/scsi_all.h	Fri Dec 21 17:57:29 2007
>@@ -90,6 +90,7 @@ typedef enum {
> 					    * and text.
> 					    */
> 	SSQ_PRINT_SENSE		= 0x0800,
>+	SSQ_PRINT_SENSE_VERBOSE	= 0x1000,
> 	SSQ_MASK		= 0xff00
> } scsi_sense_action_qualifier;
> 
>@@ -104,6 +105,12 @@ typedef enum {
> 
> /* Fatal error action, with table specified error code */
> #define SS_FATAL	SS_FAIL|SSQ_PRINT_SENSE
>+
>+/* Fatal error action, with table specified error code */
>+/* This type of error doesn't imply malfunction of hardware and
>+ * and indicates conditions that can occur in "normal" circumstances
>+ */
>+#define SS_FATAL_NORMAL	SS_FAIL|SSQ_PRINT_SENSE_VERBOSE
> 
> struct scsi_generic
> {
>--- sys/cam/scsi/scsi_all.c.orig	Fri Dec 21 17:54:50 2007
>+++ sys/cam/scsi/scsi_all.c	Tue Dec 25 14:07:45 2007
>@@ -1102,7 +1102,7 @@ static struct asc_table_entry asc_table[
> 			"Persistent write protect") },
> /*  T           */{SST(0x27, 0x05, SS_FATAL|EACCES,
> 			"Permanent write protect") },
>-/* DTLPWRSOMCAE */{SST(0x28, 0x00, SS_FATAL|ENXIO,
>+/* DTLPWRSOMCAE */{SST(0x28, 0x00, SS_FATAL_NORMAL|ENXIO,
> 			"Not ready to ready change, medium may have changed") },
> /* DTLPWRSOMCAE */{SST(0x28, 0x01, SS_FATAL|ENXIO,
> 			"Import or export element accessed") },
>@@ -1197,7 +1197,7 @@ static struct asc_table_entry asc_table[
> 			"Rounded parameter") },
> /* DTL WRSOMCAE */{SST(0x39, 0x00, SS_RDEF,
> 			"Saving parameters not supported") },
>-/* DTL WRSOM    */{SST(0x3A, 0x00, SS_FATAL|ENXIO,
>+/* DTL WRSOM    */{SST(0x3A, 0x00, SS_FATAL_NORMAL|ENXIO,
> 			"Medium not present") },
> /* DT  WR OM    */{SST(0x3A, 0x01, SS_FATAL|ENXIO,
> 			"Medium not present - tray closed") },
>@@ -1395,7 +1395,7 @@ static struct asc_table_entry asc_table[
> 			"End of user area encountered on this track") },
> /*      R       */{SST(0x63, 0x01, SS_FATAL|ENOSPC,
> 			"Packet does not fit in available space") },
>-/*      R       */{SST(0x64, 0x00, SS_FATAL|ENXIO,
>+/*      R       */{SST(0x64, 0x00, SS_FATAL_NORMAL|ENXIO,
> 			"Illegal mode for this track") },
> /*      R       */{SST(0x64, 0x01, SS_RDEF,
> 			"Invalid packet size") },
>--- sys/cam/cam_periph.c.orig	Fri Dec 21 17:57:53 2007
>+++ sys/cam/cam_periph.c	Fri Dec 21 18:00:13 2007
>@@ -1515,7 +1515,8 @@ camperiphscsisenseerror(union ccb *ccb, 
> 		}
> 
> sense_error_done:
>-		if ((err_action & SSQ_PRINT_SENSE) != 0
>+		if (((err_action & SSQ_PRINT_SENSE) != 0
>+		    || ((err_action & SSQ_PRINT_SENSE_VERBOSE) != 0 && bootverbose))
> 		 && (ccb->ccb_h.status & CAM_AUTOSNS_VALID) != 0) {
> 			cam_error_print(print_ccb, CAM_ESF_ALL, CAM_EPF_ALL);
> 			xpt_print_path(ccb->ccb_h.path);

Actions: View | Diff

Attachments on bug 119668: 83797