summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/conf
diff options
context:
space:
mode:
authorStefan Fritsch <sf@cvs.openbsd.org>2012-09-19 19:24:34 +0000
committerStefan Fritsch <sf@cvs.openbsd.org>2012-09-19 19:24:34 +0000
commit14d25ef86c56f8785dce0f9911afc33ac48155a7 (patch)
treef39ddbee72f9fab0b16178af9c9feee8592def55 /sys/arch/amd64/conf
parent7a9376510fb01519452fa89de1bb636aa11894b6 (diff)
Add new drivers for virtio network (vio) and block devices (vioblk, the disks
attach as scsi disks). These are paravirtualized devices offered by some hypervisors like kvm and virtualbox. The virtio transport driver has the pci specific parts separated out. This will make it easier to add support for mmio (e.g. for ARM) later. OK mikeb OK jasper "commit what you have" deraadt
Diffstat (limited to 'sys/arch/amd64/conf')
-rw-r--r--sys/arch/amd64/conf/GENERIC7
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index ede6f40d7bf..cc11eb39059 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.331 2012/08/14 00:54:12 dlg Exp $
+# $OpenBSD: GENERIC,v 1.332 2012/09/19 19:24:33 sf Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -599,3 +599,8 @@ pseudo-device mtrr 1 # Memory range attributes control
# mouse & keyboard multiplexor pseudo-devices
pseudo-device wsmux 2
pseudo-device crypto 1
+
+# Virtio devices
+virtio* at pci? # Virtio PCI device
+vioblk* at virtio? # Virtio block device
+vio* at virtio? # Virtio network device