Module Name: src
Committed By: christos
Date: Tue Apr 11 14:32:43 UTC 2017
Modified Files:
src/sys/dev/scsipi: scsipiconf.c
Log Message:
Put back module_autoload code; the module_autoload code now checks that
root is mounted.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/scsipi/scsipiconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/scsipi/scsipiconf.c
diff -u src/sys/dev/scsipi/scsipiconf.c:1.43 src/sys/dev/scsipi/scsipiconf.c:1.44
--- src/sys/dev/scsipi/scsipiconf.c:1.43 Mon Apr 10 17:53:37 2017
+++ src/sys/dev/scsipi/scsipiconf.c Tue Apr 11 10:32:43 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipiconf.c,v 1.43 2017/04/10 21:53:37 jdolecek Exp $ */
+/* $NetBSD: scsipiconf.c,v 1.44 2017/04/11 14:32:43 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipiconf.c,v 1.43 2017/04/10 21:53:37 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipiconf.c,v 1.44 2017/04/11 14:32:43 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,6 +72,7 @@ int scsi_verbose_loaded = 0;
int
scsipi_print_sense_stub(struct scsipi_xfer * xs, int verbosity)
{
+ scsipi_load_verbose();
if (scsi_verbose_loaded)
return scsipi_print_sense(xs, verbosity);
else
@@ -81,6 +82,7 @@ scsipi_print_sense_stub(struct scsipi_xf
void
scsipi_print_sense_data_stub(struct scsi_sense_data *sense, int verbosity)
{
+ scsipi_load_verbose();
if (scsi_verbose_loaded)
scsipi_print_sense_data(sense, verbosity);
}
@@ -108,6 +110,16 @@ scsipi_command(struct scsipi_periph *per
return rc;
}
+/*
+ * Load the scsiverbose module
+ */
+void
+scsipi_load_verbose(void)
+{
+ if (scsi_verbose_loaded == 0)
+ module_autoload("scsiverbose", MODULE_CLASS_MISC);
+}
+
/*
* allocate and init a scsipi_periph structure for a new device.
*/
