summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/conf
diff options
context:
space:
mode:
authorMatthew Dempsky <matthew@cvs.openbsd.org>2013-12-20 21:50:50 +0000
committerMatthew Dempsky <matthew@cvs.openbsd.org>2013-12-20 21:50:50 +0000
commite0dd152a3bdf42702910b6fc21950072e963e8e4 (patch)
treeaeecb4599e54d6174f8ad85d8ca03d1a671d326d /sys/arch/amd64/conf
parent2b7769e56795095d3cf8a1bb7a750d93bba92e41 (diff)
Add vioscsi(4) driver.
Still a work-in-progress, but functional enough to work with both Google Compute Engine and RHEVM. Committing so additional testing and cleanup can be handled in tree. thx Jiri B for RHEVM testing ok dlg, deraadt
Diffstat (limited to 'sys/arch/amd64/conf')
-rw-r--r--sys/arch/amd64/conf/GENERIC3
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index b42cd90411c..871bfdd54a8 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.354 2013/12/19 21:30:02 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.355 2013/12/20 21:50:49 matthew Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -606,3 +606,4 @@ virtio* at pci? # Virtio PCI device
vioblk* at virtio? # Virtio block device
vio* at virtio? # Virtio network device
viomb* at virtio? # Virtio memory ballooning device
+vioscsi* at virtio? # Virtio SCSI device
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index eeeedc8011c..2b08d40ae5a 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.132 2013/11/15 19:42:20 sasano Exp $
+# $OpenBSD: RAMDISK_CD,v 1.133 2013/12/20 21:50:49 matthew Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -344,3 +344,4 @@ pseudo-device bio 1 # ioctl multiplexing device
virtio* at pci? # Virtio PCI device
vioblk* at virtio? # Virtio block device
vio* at virtio? # Virtio network device
+vioscsi* at virtio? # Virtio SCSI device