[src/trunk]: src/sys/dev/scsipi Don't print junk if an INQUIRY fails (usually...

[mycroft <mycroft%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7b2571d5f0ac
branches:  trunk
changeset: 552078:7b2571d5f0ac
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Thu Sep 18 05:06:53 2003 +0000

description:
Don't print junk if an INQUIRY fails (usually with an ILLEGAL REQUEST due to
an unused LUN).  Also, if the qualifier says the LUN is non-existant, don't
try to attach a device here.

diffstat:

 sys/dev/scsipi/scsiconf.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r 61d2afb5e1dc -r 7b2571d5f0ac sys/dev/scsipi/scsiconf.c
--- a/sys/dev/scsipi/scsiconf.c Thu Sep 18 01:41:56 2003 +0000
+++ b/sys/dev/scsipi/scsiconf.c Thu Sep 18 05:06:53 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsiconf.c,v 1.216 2003/09/12 16:39:25 mycroft Exp $   */
+/*     $NetBSD: scsiconf.c,v 1.217 2003/09/18 05:06:53 mycroft Exp $   */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.216 2003/09/12 16:39:25 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.217 2003/09/18 05:06:53 mycroft Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -769,7 +769,7 @@
                        extension[len++] = ' ';
        }
        if (scsipi_inquire(periph, &inqbuf,
-           XS_CTL_DISCOVERY | XS_CTL_DATA_ONSTACK) != 0)
+           XS_CTL_DISCOVERY | XS_CTL_DATA_ONSTACK | XS_CTL_SILENT) != 0)
                goto bad;
 
        periph->periph_type = inqbuf.device & SID_TYPE;
@@ -785,10 +785,10 @@
        checkdtype = 0;
        switch (inqbuf.device & SID_QUAL) {
        case SID_QUAL_LU_PRESENT:
-       case SID_QUAL_LU_NOTPRESENT:
                checkdtype = 1;
                break;
 
+       case SID_QUAL_LU_NOTPRESENT:
        case SID_QUAL_reserved:
        case SID_QUAL_LU_NOT_SUPP:
                goto bad;