wire vscsi up to a cdev

for claudio@ ok deraadt@

21 files changed, 81 insertions, 30 deletions

diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 869155f4977..877e2cdc497 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.59 2009/06/03 14:45:50 jj Exp $	*/
+/*	$OpenBSD: conf.c,v 1.60 2009/08/13 15:04:20 dlg Exp $	*/
 /*	$NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $	*/
 
 /*-
@@ -134,6 +134,7 @@ cdev_decl(pci);
 
 #include "systrace.h"
 #include "hotplug.h"
+#include "vscsi.h"
 
 struct cdevsw	cdevsw[] =
 {
@@ -206,6 +207,7 @@ struct cdevsw	cdevsw[] =
 	cdev_bktr_init(NBKTR,bktr),	/* 58: Bt848 video capture device */
 	cdev_radio_init(NRADIO,radio), /* 59: generic radio I/O */
 	cdev_mouse_init(NWSMUX, wsmux),	/* 60: ws multiplexor */
+	cdev_vscsi_init(NVSCSI, vscsi),	/* 61: vscsi */
 };
 int	nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);
 
diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c
index 683bd39f7ff..5736633175a 100644
--- a/sys/arch/amd64/amd64/conf.c
+++ b/sys/arch/amd64/amd64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.26 2009/08/10 14:40:27 jsg Exp $	*/
+/*	$OpenBSD: conf.c,v 1.27 2009/08/13 15:04:20 dlg Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -190,6 +190,7 @@ cdev_decl(pci);
 #include "pf.h"
 #include "hotplug.h"
 #include "gpio.h"
+#include "vscsi.h"
 
 struct cdevsw	cdevsw[] =
 {
@@ -302,6 +303,7 @@ struct cdevsw	cdevsw[] =
 	cdev_agp_init(NAGP,agp),	/* 86: agp */
 	cdev_drm_init(NDRM,drm),	/* 87: drm */
 	cdev_gpio_init(NGPIO,gpio),	/* 88: gpio */
+	cdev_vscsi_init(NVSCSI,vscsi),	/* 89: vscsi */
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c
index d88cde44a97..c28e3fe6d69 100644
--- a/sys/arch/arm/arm/conf.c
+++ b/sys/arch/arm/arm/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.22 2009/06/03 14:45:50 jj Exp $	*/
+/*	$OpenBSD: conf.c,v 1.23 2009/08/13 15:04:20 dlg Exp $	*/
 /*	$NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $	*/
 
 /*
@@ -280,6 +280,7 @@ cdev_decl(nnpfs_dev);
 #include "systrace.h"
 
 #include "hotplug.h"
+#include "vscsi.h"
 
 #ifdef CONF_HAVE_GPIO
 #include "gpio.h"
@@ -402,6 +403,7 @@ struct cdevsw cdevsw[] = {
 	cdev_radio_init(NRADIO,radio),		/* 97: generic radio I/O */
 	cdev_ptm_init(NPTY,ptm),		/* 98: pseudo-tty ptm device */
 	cdev_spkr_init(NSPKR,spkr),		/* 99: PC speaker */
+	cdev_vscsi_init(NVSCSI,vscsi),		/* 100: vscsi */
 };
 
 int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
diff --git a/sys/arch/aviion/aviion/conf.c b/sys/arch/aviion/aviion/conf.c
index 24d3546de4c..dcd1b8c14ad 100644
--- a/sys/arch/aviion/aviion/conf.c
+++ b/sys/arch/aviion/aviion/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.8 2009/06/03 14:45:51 jj Exp $	*/
+/*	$OpenBSD: conf.c,v 1.9 2009/08/13 15:04:20 dlg Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -59,6 +59,7 @@
 #include "uk.h"
 #include "vme.h"
 #include "vnd.h"
+#include "vscsi.h"
 #ifdef NNPFS
 #include <nnpfs/nnnpfs.h>
 cdev_decl(nnpfs_dev);
@@ -147,6 +148,7 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 51 */
 #endif
 	cdev_ptm_init(NPTY,ptm),	/* 52: pseudo-tty ptm device */
+	cdev_vscsi_init(NVSCSI,vscsi),	/* 53: vscsi */
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c
index 94b146fce10..1a4d001f2e6 100644
--- a/sys/arch/hp300/hp300/conf.c
+++ b/sys/arch/hp300/hp300/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.45 2009/06/03 14:45:51 jj Exp $	*/
+/*	$OpenBSD: conf.c,v 1.46 2009/08/13 15:04:20 dlg Exp $	*/
 /*	$NetBSD: conf.c,v 1.39 1997/05/12 08:17:53 thorpej Exp $	*/
 
 /*-
@@ -113,6 +113,7 @@ cdev_decl(nnpfs_dev);
 #include "wsmux.h"
 #include "pf.h"
 #include "systrace.h"
+#include "vscsi.h"
 
 struct cdevsw	cdevsw[] =
 {
@@ -173,6 +174,7 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 51 */
 #endif
 	cdev_ptm_init(NPTY,ptm),	/* 52: pseudo-tty ptm device */
+	cdev_vscsi_init(NVSCSI,vscsi),	/* 53: vscsi */
 
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c
index c6c4e8dcae8..758c4739397 100644
--- a/sys/arch/hppa/hppa/conf.c
+++ b/sys/arch/hppa/hppa/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.46 2009/06/03 14:45:51 jj Exp $	*/
+/*	$OpenBSD: conf.c,v 1.47 2009/08/13 15:04:20 dlg Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -109,6 +109,7 @@ cdev_decl(com);
 
 #include "systrace.h"
 #include "hotplug.h"
+#include "vscsi.h"
 
 #ifdef USER_PCICONF
 #include "pci.h"
@@ -188,6 +189,7 @@ struct cdevsw   cdevsw[] =
 	cdev_lkm_dummy(),		/* 51: */
 	cdev_lkm_dummy(),		/* 52: */
 	cdev_lkm_dummy(),		/* 53: */
+	cdev_vscsi_init(NVSCSI,vscsi),	/* 54: */
 };
 int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
diff --git a/sys/arch/hppa64/hppa64/conf.c b/sys/arch/hppa64/hppa64/conf.c
index 3a9091cd129..5dc71e0b995 100644
--- a/sys/arch/hppa64/hppa64/conf.c
+++ b/sys/arch/hppa64/hppa64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.12 2009/06/03 14:45:51 jj Exp $	*/
+/*	$OpenBSD: conf.c,v 1.13 2009/08/13 15:04:20 dlg Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -110,6 +110,8 @@ cdev_decl(com);
 
 #include "systrace.h"
 
+#include "vscsi.h"
+
 #ifdef USER_PCICONF
 #include "pci.h"
 cdev_decl(pci);
@@ -166,12 +168,14 @@ struct cdevsw   cdevsw[] =
 	cdev_bio_init(NBIO,bio),	/* 37: ioctl tunnel */
 	cdev_ptm_init(NPTY,ptm),	/* 38: pseudo-tty ptm device */
 	cdev_disk_init(NWD,wd),		/* 39: ST506 disk */
-	cdev_lkm_dummy(),
-	cdev_lkm_dummy(),
-	cdev_lkm_dummy(),
-	cdev_lkm_dummy(),
-	cdev_lkm_dummy(),
-	cdev_lkm_dummy(),
+	cdev_lkm_dummy(),		/* 40 */
+	cdev_lkm_dummy(),		/* 41 */
+	cdev_lkm_dummy(),		/* 42 */
+	cdev_lkm_dummy(),		/* 43 */
+	cdev_lkm_dummy(),		/* 44 */
+	cdev_lkm_dummy(),		/* 45 */
+	cdev_vscsi_init(NVSCSI,vscsi),	/* 46: vscsi */
+	
 };
 int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index c11f3de0089..2cb1817a288 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.131 2009/06/03 14:45:51 jj Exp $	*/
+/*	$OpenBSD: conf.c,v 1.132 2009/08/13 15:04:20 dlg Exp $	*/
 /*	$NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $	*/
 
 /*
@@ -193,6 +193,7 @@ cdev_decl(pci);
 #include "hotplug.h"
 #include "gpio.h"
 #include "amdmsr.h"
+#include "vscsi.h"
 
 struct cdevsw	cdevsw[] =
 {
@@ -305,7 +306,8 @@ struct cdevsw	cdevsw[] =
 	cdev_bthub_init(NBTHUB,bthub),	/* 86: bthub */
 	cdev_agp_init(NAGP,agp),	/* 87: agp */
 	cdev_drm_init(NDRM,drm),	/* 88: drm */
-	cdev_amdmsr_init(NAMDMSR,amdmsr)	/* 89: amdmsr */
+	cdev_amdmsr_init(NAMDMSR,amdmsr),	/* 89: amdmsr */
+	cdev_vscsi_init(NVSCSI,vscsi),	/* 90: vscsi */
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
diff --git a/sys/arch/landisk/landisk/conf.c b/sys/arch/landisk/landisk/conf.c
index ee0e7c8c315..98fb35877d1 100644
--- a/sys/arch/landisk/landisk/conf.c
+++ b/sys/arch/landisk/landisk/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.12 2009/06/03 14:45:52 jj Exp $	*/
+/*	$OpenBSD: conf.c,v 1.13 2009/08/13 15:04:20 dlg Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -265,6 +265,7 @@ cdev_decl(nnpfs_dev);
 
 #include "hotplug.h"
 #include "scif.h"
+#include "vscsi.h"
 
 #ifdef CONF_HAVE_GPIO
 #include "gpio.h"
@@ -380,6 +381,7 @@ struct cdevsw cdevsw[] = {
 	cdev_notdef(),                          /* 96: removed device */
 	cdev_radio_init(NRADIO,radio),		/* 97: generic radio I/O */
 	cdev_ptm_init(NPTY,ptm),		/* 98: pseudo-tty ptm device */
+	cdev_vscsi_init(NVSCSI,vscsi),		/* 99: vscsi */
 };
 
 int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
diff --git a/sys/arch/luna88k/luna88k/conf.c b/sys/arch/luna88k/luna88k/conf.c
index caef40045b5..e09b5c845a5 100644
--- a/sys/arch/luna88k/luna88k/conf.c
+++ b/sys/arch/luna88k/luna88k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.11 2009/06/03 14:45:52 jj Exp $	*/
+/*	$OpenBSD: conf.c,v 1.12 2009/08/13 15:04:20 dlg Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -70,6 +70,7 @@ cdev_decl(nnpfs_dev);
 
 #include "pf.h"
 #include "systrace.h"
+#include "vscsi.h"
 
 struct bdevsw	bdevsw[] =
 {
@@ -156,6 +157,7 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 51 */
 #endif
 	cdev_ptm_init(NPTY,ptm),	/* 52: pseudo-tty ptm device */
+	cdev_vscsi_init(NVSCSI,vscsi),	/* 53: vscsi */
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
diff --git a/sys/arch/mac68k/mac68k/conf.c b/sys/arch/mac68k/mac68k/conf.c
index 5410c6215ca..41759fb95a7 100644
--- a/sys/arch/mac68k/mac68k/conf.c
+++ b/sys/arch/mac68k/mac68k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.43 2009/06/03 14:45:52 jj Exp $	*/
+/*	$OpenBSD: conf.c,v 1.44 2009/08/13 15:04:20 dlg Exp $	*/
 /*	$NetBSD: conf.c,v 1.41 1997/02/11 07:35:49 scottr Exp $	*/
 
 /*
@@ -106,6 +106,8 @@ cdev_decl(nnpfs_dev);
 
 #include "systrace.h"
 
+#include "vscsi.h"
+
 struct cdevsw	cdevsw[] =
 {
 	cdev_cn_init(1,cn),		/* 0: virtual console */
@@ -165,6 +167,7 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 51 */
 #endif
 	cdev_ptm_init(NPTY,ptm),	/* 52: pseudo-tty ptm device */
+	cdev_vscsi_init(NVSCSI,vscsi),	/* 53: vscsi */
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c
index ed8e133ba79..f8796d673e1 100644
--- a/sys/arch/macppc/macppc/conf.c
+++ b/sys/arch/macppc/macppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.39 2009/06/03 14:45:52 jj Exp $ */
+/*	$OpenBSD: conf.c,v 1.40 2009/08/13 15:04:20 dlg Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -142,6 +142,7 @@ cdev_decl(pci);
 #include "hotplug.h"
 #include "gpio.h"
 #include "bio.h"
+#include "vscsi.h"
 
 struct cdevsw cdevsw[] = {
 	cdev_cn_init(1,cn),		/* 0: virtual console */
@@ -239,6 +240,7 @@ struct cdevsw cdevsw[] = {
 	cdev_bio_init(NBIO,bio),	/* 80: ioctl tunnel */
 	cdev_bthub_init(NBTHUB,bthub),	/* 81: bthub */
 	cdev_openprom_init(1,openprom),	/* 82: /dev/openprom */
+	cdev_vscsi_init(NVSCSI,vscsi),	/* 83: vscsi */
 };
 int nchrdev = sizeof cdevsw / sizeof cdevsw[0];
 
diff --git a/sys/arch/mvme68k/mvme68k/conf.c b/sys/arch/mvme68k/mvme68k/conf.c
index 2479d2bdd5c..6ed0b740e57 100644
--- a/sys/arch/mvme68k/mvme68k/conf.c
+++ b/sys/arch/mvme68k/mvme68k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.46 2009/06/03 14:45:52 jj Exp $ */
+/*	$OpenBSD: conf.c,v 1.47 2009/08/13 15:04:20 dlg Exp $ */
 
 /*-
  * Copyright (c) 1995 Theo de Raadt
@@ -153,6 +153,8 @@ cdev_decl(xd);
 
 #include "systrace.h"
 
+#include "vscsi.h"
+
 struct cdevsw	cdevsw[] =
 {
 	cdev_cn_init(1,cn),		/* 0: virtual console */
@@ -216,6 +218,7 @@ struct cdevsw	cdevsw[] =
 	cdev_lkm_dummy(),		/* 51 */
 #endif
 	cdev_ptm_init(NPTY,ptm),	/* 52: pseudo-tty ptm device */
+	cdev_vscsi_init(NVSCSI,vscsi),	/* 53: vscsi */
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
diff --git a/sys/arch/mvme88k/mvme88k/conf.c b/sys/arch/mvme88k/mvme88k/conf.c
index e7a8d6c5592..e1bc68f24af 100644
--- a/sys/arch/mvme88k/mvme88k/conf.c
+++ b/sys/arch/mvme88k/mvme88k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.38 2009/06/03 14:45:52 jj Exp $	*/
+/*	$OpenBSD: conf.c,v 1.39 2009/08/13 15:04:20 dlg Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -103,6 +103,8 @@ cdev_decl(lptwo);
 
 #include "systrace.h"
 
+#include "vscsi.h"
+
 struct bdevsw	bdevsw[] =
 {
 	bdev_notdef(),			/* 0 */
@@ -201,6 +203,7 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 51 */
 #endif
 	cdev_ptm_init(NPTY,ptm),	/* 52: pseudo-tty ptm device */
+	cdev_vscsi_init(NVSCSI,vscsi),	/* 53: vscsi */
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
diff --git a/sys/arch/mvmeppc/mvmeppc/conf.c b/sys/arch/mvmeppc/mvmeppc/conf.c
index 3e4553565eb..0c0aef05bf7 100644
--- a/sys/arch/mvmeppc/mvmeppc/conf.c
+++ b/sys/arch/mvmeppc/mvmeppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.25 2009/06/03 14:45:52 jj Exp $ */
+/*	$OpenBSD: conf.c,v 1.26 2009/08/13 15:04:20 dlg Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -113,6 +113,8 @@ cdev_decl(nnpfs_dev);
 
 #include "systrace.h"
 
+#include "vscsi.h"
+
 struct cdevsw cdevsw[] = {
         cdev_cn_init(1,cn),             /* 0: virtual console */
         cdev_ctty_init(1,ctty),         /* 1: controlling terminal */
@@ -178,6 +180,7 @@ struct cdevsw cdevsw[] = {
 	cdev_bio_init(NBIO,bio),	/* 53: ioctl tunnel */
 	cdev_disk_init(NRAID,raid),	/* 54: RAIDframe disk driver */
 	cdev_ptm_init(NPTY,ptm),	/* 55: pseudo-tty ptm device */
+	cdev_vscsi_init(NVSCSI,vscsi),	/* 56: vscsi */
 };
 int nchrdev = sizeof cdevsw / sizeof cdevsw[0];
 
diff --git a/sys/arch/sgi/sgi/conf.c b/sys/arch/sgi/sgi/conf.c
index aed7f4afb53..0c8433e6a2c 100644
--- a/sys/arch/sgi/sgi/conf.c
+++ b/sys/arch/sgi/sgi/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.21 2009/08/09 21:07:25 miod Exp $ */
+/*	$OpenBSD: conf.c,v 1.22 2009/08/13 15:04:20 dlg Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -130,6 +130,7 @@ cdev_decl(pci);
 #include "ulpt.h"
 #include "urio.h"
 #include "ucom.h"
+#include "vscsi.h"
 
 struct cdevsw	cdevsw[] =
 {
@@ -208,7 +209,8 @@ struct cdevsw	cdevsw[] =
 	cdev_ulpt_init(NULPT,ulpt),	/* 64: USB printers */
 	cdev_urio_init(NURIO,urio),	/* 65: USB Diamond Rio 500 */
 	cdev_tty_init(NUCOM,ucom),	/* 66: USB tty */
-	cdev_hotplug_init(NHOTPLUG,hotplug) /* 67: devices hotplugging */
+	cdev_hotplug_init(NHOTPLUG,hotplug), /* 67: devices hotplugging */
+	cdev_vscsi_init(NVSCSI,vscsi),	/* 68: vscsi */
 };
 
 int	nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);
diff --git a/sys/arch/socppc/socppc/conf.c b/sys/arch/socppc/socppc/conf.c
index 9b588feabf5..111543cd4a4 100644
--- a/sys/arch/socppc/socppc/conf.c
+++ b/sys/arch/socppc/socppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.6 2009/05/31 20:43:44 maja Exp $ */
+/*	$OpenBSD: conf.c,v 1.7 2009/08/13 15:04:20 dlg Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -110,6 +110,8 @@ cdev_decl(pci);
 #include "usb.h"
 #include "uhid.h"
 
+#include "vscsi.h"
+
 struct cdevsw cdevsw[] = {
 	cdev_cn_init(1,cn),		/* 0: virtual console */
 	cdev_ctty_init(1,ctty),		/* 1: controlling terminal */
@@ -195,6 +197,7 @@ struct cdevsw cdevsw[] = {
 	cdev_notdef(),			/* 75 */
 	cdev_notdef(),			/* 76 */
 	cdev_ptm_init(NPTY,ptm),	/* 77: pseudo-tty ptm device */
+	cdev_vscsi_init(NVSCSI,vscsi),	/* 78: vscsi */
 };
 int nchrdev = sizeof cdevsw / sizeof cdevsw[0];
 
diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c
index b675c102b29..7835978a51e 100644
--- a/sys/arch/sparc/sparc/conf.c
+++ b/sys/arch/sparc/sparc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.49 2009/06/03 14:45:53 jj Exp $	*/
+/*	$OpenBSD: conf.c,v 1.50 2009/08/13 15:04:20 dlg Exp $	*/
 /*	$NetBSD: conf.c,v 1.40 1996/04/11 19:20:03 thorpej Exp $ */
 
 /*
@@ -128,6 +128,7 @@ int	nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
 #include "pf.h"
 #include "systrace.h"
 #include "tctrl.h"
+#include "vscsi.h"
 
 struct cdevsw	cdevsw[] =
 {
@@ -266,6 +267,7 @@ struct cdevsw	cdevsw[] =
 	cdev_disk_init(NRAID,raid),     /* 123: RAIDframe disk driver */
 	cdev_bio_init(NBIO,bio),	/* 124: ioctl tunnel */
 	cdev_ptm_init(NPTY,ptm),	/* 125: pseudo-tty ptm device */
+	cdev_vscsi_init(NVSCSI,vscsi),	/* 128: vscsi */
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c
index e5f5a242280..89f22cb5bc2 100644
--- a/sys/arch/sparc64/sparc64/conf.c
+++ b/sys/arch/sparc64/sparc64/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.51 2009/06/03 14:45:53 jj Exp $	*/
+/*	$OpenBSD: conf.c,v 1.52 2009/08/13 15:04:20 dlg Exp $	*/
 /*	$NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */
 
 /*
@@ -118,6 +118,7 @@ cdev_decl(nnpfs_dev);
 
 #include "systrace.h"
 #include "hotplug.h"
+#include "vscsi.h"
 
 struct bdevsw	bdevsw[] =
 {
@@ -288,7 +289,8 @@ struct cdevsw	cdevsw[] =
 	cdev_hotplug_init(NHOTPLUG,hotplug), /* 124: devices hot plugging */
 	cdev_tty_init(NVCONS,vcons),	/* 125: virtual console */
 	cdev_tty_init(NSBBC,sbbc),	/* 126: SBBC console */
-	cdev_tty_init(NVCCTTY,vcctty)	/* 127: virtual console concentrator */
+	cdev_tty_init(NVCCTTY,vcctty),	/* 127: virtual console concentrator */
+	cdev_tty_init(NVSCSI,vscsi),	/* 128: vscsi */
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c
index 212873f8ee5..06aa72d08ca 100644
--- a/sys/arch/vax/vax/conf.c
+++ b/sys/arch/vax/vax/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.57 2009/06/03 14:45:53 jj Exp $ */
+/*	$OpenBSD: conf.c,v 1.58 2009/08/13 15:04:20 dlg Exp $ */
 /*	$NetBSD: conf.c,v 1.44 1999/10/27 16:38:54 ragge Exp $	*/
 
 /*-
@@ -355,6 +355,8 @@ cdev_decl(nnpfs_dev);
 
 #include "systrace.h"
 
+#include "vscsi.h"
+
 struct cdevsw	cdevsw[] =
 {
 	cdev_cn_init(1,cn),		/* 0: virtual console */
@@ -437,6 +439,7 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 74 */
 #endif
 	cdev_ptm_init(NPTY,ptm),	/* 75: pseudo-tty ptm device */
+	cdev_vscsi_init(NVSCSI,vscsi),	/* 78: vscsi */
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
 
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 884da3191bf..bde5508e419 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.146 2009/08/09 12:47:23 dlg Exp $
+#	$OpenBSD: GENERIC,v 1.147 2009/08/13 15:04:20 dlg Exp $
 #
 #	Machine-independent option; used by all architectures for their
 #	GENERIC kernel
@@ -70,6 +70,9 @@ option		MROUTING	# Multicast router
 softraid0	at root		# Software RAID
 scsibus*	at softraid?
 
+vscsi0		at root		# Userland backed Virtual SCSI
+scsibus*	at vscsi?
+
 pseudo-device	pf		# packet filter
 pseudo-device	pflog		# pf log if
 pseudo-device	pfsync		# pf sync if